Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42570] trunk
|
From: <lph...@us...> - 2012-08-12 12:59:04
|
Revision: 42570
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42570&view=rev
Author: lphuberdeau
Date: 2012-08-12 12:58:57 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
[MRG] Automatic merge, branches/9.x 42542 to 42569
Modified Paths:
--------------
trunk/doc/devtools/tikilite.sh
trunk/lib/codemirror_tiki/codemirror_tiki.js
trunk/lib/svg-edit_tiki/draw.js
trunk/lib/trackers/trackerlib.php
trunk/templates/tiki-user_drilldownmenu.tpl
trunk/templates/tiki-view_forum.tpl
trunk/templates/tiki-wiki_structure_bar.tpl
trunk/tiki-setup_base.php
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
/branches/6.x:29486-31409,33409
/branches/7.x:33633-36216,36238,36257,36453
/branches/8.x:37900-39390,39479
/branches/9.x:40481-42542
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/foreign-storage:34822-34895
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/experimental/xajax_removal:31497
/branches/proposals/4.x:24005
+ /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
/branches/6.x:29486-31409,33409
/branches/7.x:33633-36216,36238,36257,36453
/branches/8.x:37900-39390,39479
/branches/9.x:40481-42569
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/foreign-storage:34822-34895
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/experimental/xajax_removal:31497
/branches/proposals/4.x:24005
Modified: trunk/doc/devtools/tikilite.sh
===================================================================
--- trunk/doc/devtools/tikilite.sh 2012-08-12 12:49:05 UTC (rev 42569)
+++ trunk/doc/devtools/tikilite.sh 2012-08-12 12:58:57 UTC (rev 42570)
@@ -1,149 +1,109 @@
#!/bin/sh
-# originall written by mo...@fe...
-# maintained by wol...@ya...
-
+# originally written by mose
+# modified for Tiki 9.x by luci
+#
# ############################################################
#
-# HOWTO create Tikiwiki-Lite ?
-# --------------------------
+# How to Create Tiki-Lite ?
+# -------------------------
#
# The following are instructions on how to use the TikiLite script.
#
-# The current defaults are english language and MoreNeat theme.
+# The current defaults are English language and jQUI theme.
# These can be modified from the script.
#
#To Install
#
-# 1. Check out a new installation of Tikiwiki into a directory of your choice.
-# 2. Move to the top of your Tikiwiki installation.
+# 1. Check out a new installation of Tiki into a directory of your choice.
+# 2. Move to the top of your Tiki installation.
# 3. Modify doc/devtools/tikilite.sh to point to set your defaults.
# 4. Execute doc/devtools/tikilite.sh - this will remove all non-core files and directories.
#
#To Update
#
-# 1. Do a cvs up in your TikiLite directory
+# 1. Do a svn up in your TikiLite directory
# 2. Execute doc/devtools/tikilite.sh script again
#
# ############################################################
#
-# HOWTO modify this file
-# ----------------------
+# How to modify this file
+# -----------------------
#
# The structure is faily simple, removals are done on a per feature basis,
-# with an indication of dependancies.
+# with an indication of dependencies.
#
-# Any dependancies found in multiple features, should be moved to the bottom
+# Any dependencies found in multiple features, should be moved to the bottom
# of the file.
#
# Whether you are fixing a feature, creating a new feature or uncommenting
# a disabled feature, the standard should remain the same.
#
# ############################################################
+# TODO: make the script interactive !
LANG_DEF="en"
-THEME_DEF="moreneat"
+THEME_DEF="jqui"
-echo "Removing duplicate Date lib..."
-rm -rf lib/Date
+echo "Removing languages except default..."
+find lang/* -type d | grep -v "/$LANG_DEF" | grep -v \.svn | xargs -- rm -rf
-echo "Removing AdoDB tests..."
-rm -rf lib/adodb/tests
+#echo "Removing iCal..."
+#rm -rf lib/calendar/iCal
-echo
+#echo "Removing jsCalendar..."
+#rm -rf lib/jscalendar
-echo "Removing DB extras..."
-rm -rf db/oracle
-rm -rf db/pgsql
-
-echo "Removing Avatars..."
-find img/avatars/ -type f -name '*.gif' | grep -v 000 | xargs -- rm -f
-
-# Used in the spell checking
-# Had DB dependancies that need to be fixed
-# Needs checking for sql tables in DB
-echo "Removing Bablotron..."
-# Dependancies on PEAR::DB
-rm -rf lib/bablotron.php
-
-echo "Removing Languages except default..."
-find lang/* -type d | grep -v "/$LANG_DEF" | grep -v CVS | xargs -- rm -rf
-
-echo "Removing iCal..."
-rm -rf lib/calendar/iCal
-
-echo "Removing jsCalendar..."
-rm -rf lib/jscalendar
-
#echo "Removing PDF fonts..."
#find lib/pdflib/fonts -type f -name "*.afm" | grep -v php_Helvetica | grep -v php_Courier | xargs -- rm -f
-echo "Removing PHPOpenTracker..."
-# Dependancies on PEAR::DB
-rm -rf lib/phpOpenTracker
-
-# Couldn't find any reference to these files anywhere?
-echo "Removing Popups..."
-rm -rf popups
-
echo "Removing Styles except default..."
-find styles/* -type d | grep -v $THEME_DEF | grep -v CVS | xargs -- rm -rf
-find styles/ -type f -name "*.css" | grep -v $THEME_DEF | xargs -- rm -f
+find styles/* -type d | grep -v $THEME_DEF | grep -v layout | grep -v lite | grep -v \.svn | xargs -- rm -rf
+find styles/ -type f -name "*.css" | grep -v $THEME_DEF | grep -v design | grep -v layout | grep -v lite | xargs -- rm -f
find templates/styles/* -type d | grep -v $THEME_DEF | xargs -- rm -rf
-rm -rf styles/README.matrix-theme
-echo "Removing IRC..."
-rm -rf var/log/irc
-rm -rf tiki-view_irc.php
-rm -rf lib/irc
-rm -rf templates/tiki-view_irc.tpl
+#echo "Removing SQL..."
+# Dependencies on PEAR::DB
+#rm -rf lib/wiki-plugins/wikiplugin_sql.php
-echo "Removing SQL..."
-# Dependancies on PEAR::DB
-rm -rf lib/wiki-plugins/wikiplugin_sql.php
+#echo "Removing Webmail..."
+#rm -rf tiki-admin_include_webmail.php
+#rm -rf tiki-webmail.php
+#rm -rf tiki-webmail_contacts.php
+#rm -rf tiki-webmail_download_attachment.php
+#rm -rf img/icons/admin_webmail.png
+#rm -rf img/icons/large/webmail.gif
+#rm -rf img/webmail
+#rm -rf templates/tiki-admin-include-webmail.tpl
+#rm -rf templates/tiki-webmail.tpl
+#rm -rf templates/tiki-webmail_contacts.tpl
+#rm -rf lib/webmail
+#rm -rf temp/mail_attachs
-echo "Removing Webmail..."
-rm -rf tiki-admin_include_webmail.php
-rm -rf tiki-webmail.php
-rm -rf tiki-webmail_contacts.php
-rm -rf tiki-webmail_download_attachment.php
-rm -rf img/icons/admin_webmail.png
-rm -rf img/icons/large/webmail.gif
-rm -rf img/webmail
-rm -rf templates/tiki-admin-include-webmail.tpl
-rm -rf templates/tiki-webmail.tpl
-rm -rf templates/tiki-webmail_contacts.tpl
-rm -rf lib/webmail
-rm -rf temp/mail_attachs
+#echo "Removing WS Server..."
+#rm -rf lib/pear/SOAP
+#rm -rf tiki-ws_client.php
+#rm -rf tiki-ws_server.php
-echo "Removing WS Server..."
-rm -rf lib/pear/SOAP
-rm -rf tiki-ws_client.php
-rm -rf tiki-ws_server.php
-
echo "Removing Tests..."
-rm -rf tiki-tests.php
+#rm -rf tiki-tests.php
rm -rf tests
-echo "Removing TikiMovies..."
-rm -rf tiki-listmovies.php
-rm -rf templates/tiki-listmovies.tpl
-rm -rf tikimovies
-
# ############################################################
-# Dependancies
+# Dependencies
+# ------------
-echo "Removing PEAR::DB..."
-rm -rf lib/pear/DB
-rm -rf lib/pear/DB.php
+#echo "Removing PEAR::DB..."
+#rm -rf lib/pear/DB
+#rm -rf lib/pear/DB.php
# ############################################################
-echo "Setting directory perms..."
-find -type d -exec chmod 775 {} \;
+#echo "Setting directory perms..."
+#find -type d -exec chmod 775 {} \;
-echo "Setting file perms..."
-find -type f -exec chmod 664 {} \;
-find -type f -name '*.sh' -exec chmod 775 {} \;
+#echo "Setting file perms..."
+#find -type f -exec chmod 664 {} \;
+#find -type f -name '*.sh' -exec chmod 775 {} \;
echo "Done."
Modified: trunk/lib/codemirror_tiki/codemirror_tiki.js
===================================================================
--- trunk/lib/codemirror_tiki/codemirror_tiki.js 2012-08-12 12:49:05 UTC (rev 42569)
+++ trunk/lib/codemirror_tiki/codemirror_tiki.js 2012-08-12 12:58:57 UTC (rev 42570)
@@ -216,6 +216,7 @@
settings.parent.find('.cm-remove').remove();
var o = jQuery(this);
+ if (o.hasClass('codeMirror') && !o.is(':visible')) return;
if ((!settings.force && !o.is('pre')) || !s.mode) {
if (!o.data('codemirror') || o.data("nocodemirror")) {
Modified: trunk/lib/svg-edit_tiki/draw.js
===================================================================
--- trunk/lib/svg-edit_tiki/draw.js 2012-08-12 12:49:05 UTC (rev 42569)
+++ trunk/lib/svg-edit_tiki/draw.js 2012-08-12 12:58:57 UTC (rev 42570)
@@ -180,32 +180,4 @@
});
});
return me;
-};
-
-$.fn.drawOver = function(o) {
- var me = $(this);
-
- o = $.extend(o,{});
-
- var draw = $('<div class="drawOver" />')
- .insertAfter(me)
- .loadDraw(o)
- .bind('loadedDraw', function() {
- //we get the doc, because it is in an iframe, it is private and IT MUST be on the same domain
- var doc = draw.data('doc');
-
- var bg = doc.find('#canvasBackground')
- .fadeTo(0.01, 0.01);
- var root = doc.find('#svgroot');
-
- me
- .css('position', 'relative')
- .css('z-index', 0)
- //better size detection and positioning here
- .css('left', (parseInt(1920 / 2) - 320) + 'px')
- .css('top', (parseInt(1440 / 2) - 240) + 'px')
- .insertBefore(root);
- });
-
- return this;
};
\ No newline at end of file
Modified: trunk/lib/trackers/trackerlib.php
===================================================================
--- trunk/lib/trackers/trackerlib.php 2012-08-12 12:49:05 UTC (rev 42569)
+++ trunk/lib/trackers/trackerlib.php 2012-08-12 12:58:57 UTC (rev 42570)
@@ -4324,7 +4324,7 @@
$fields = $this->table('tiki_tracker_fields');
$list = $fields->fetchAll($fields->all(), array(
- 'type' => 'r',
+ 'type' => $fields->exactly('r'),
));
$toConsider = array();
Modified: trunk/templates/tiki-user_drilldownmenu.tpl
===================================================================
--- trunk/templates/tiki-user_drilldownmenu.tpl 2012-08-12 12:49:05 UTC (rev 42569)
+++ trunk/templates/tiki-user_drilldownmenu.tpl 2012-08-12 12:58:57 UTC (rev 42570)
@@ -1,71 +1,53 @@
{* $Id$ *}
-{$headerlib->add_jsfile('lib/jquery/jquery.dcdrilldown.1.2.js')}
-{$headerlib->add_cssfile('lib/jquery/dcdrilldown.css')}
{jq}
- $('.drilldownmenuparent a').each(function() {
- var me = $(this);
- if (me.next().find('a').length) {
- me.append('<span class="sep"> »</span>');
- }
- me.prepend(' ');
- });
+ var drilldownactive = false;
+ var drilldowntimer = false;
+ $('div.tocnav a')
+ .mouseover(function(e) {
+ var href = $(e.target).attr('href');
+ var ul = $('ul.drilldownmenuparent').find('a[href="' + href + '"]').next(); //possible ul menu
+ var a = ul.children('li').children('a');
- function toggleSiblings(li, visible) {
- var siblings;
-
- if (li.find('li').length > 0) {
- siblings = li.children('ul').children('li');
- li = siblings.first();
- } else {
- siblings = li.siblings();
- }
-
- siblings.not(li)[visible ? 'show' : 'fadeOut']();
- }
-
- var ddmp = $('.drilldownmenuparent').data('i', 0);
- ddmp
- .bind('actionDrilldown', function(event, element, wrapper, obj) {
- ddmp.data('i', $('a', element).data('i'));
- })
- .dcDrilldown({
- speed: 'fast',
- linkType: 'breadcrumb',
- headerTag: 'span',
- showCount: false,
- eventPreventDefault: false,
- horizontal: true
- })
- .hover(function(e) {
- var i = ddmp.data('i'),
- li = lists.eq(i).parent();
-
- toggleSiblings(li, true);
- }, function() {
- var i = ddmp.data('i'),
- li = lists.eq(i).parent();
-
- toggleSiblings(li, false);
+ var drillshow = $('div.drillshow').html('');
+ if (a.length < 1) return;
+ a.each(function(i) {
+ var newA = $(this).clone().appendTo(drillshow);
+ if (i < a.length - 1) {
+ $('<span> | </span>').insertAfter(newA);
+ }
+ });
+ drilldownactive = true;
});
- var lists = ddmp.find('li a');
- //console.log(lists);
- ddmp.mouseleave();
+ $('div.tocnav').mouseout(function() {
+ drilldownactive = false;
+ if (drilldowntimer == false) {
+ drilldowntimer = true;
+ setTimeout(function() {
+ drilldowntimer = false;
+ if (drilldownactive == false) {
+ $('div.drillshow').html('');
+ }
+ }, 5000);
+ }
+ });
{/jq}
<style>
- .dd-header, .dd-header > *, .dd-header > ul > li {
- display: block ! important;
- float: left ! important;
+ .drilldownmenucontainer
+ {
+ display: none;
}
- .drilldownmenuparent
+ .drillshow
{
- position: absolute ! important;
+ position:absolute;
+ background:#ffffff;
}
-</style><br />
-<div class="dd_container">
+</style>
+<div class="drillshow"></div>
+<div class="drilldownmenucontainer">
<ul class="drilldownmenuparent">
<li>
- <a href="">{$home_info.pageName}</a>
+ <a href="tiki-index.php?page={$home_info.pageName|urlencode}&structure={$home_info.pageName|urlencode}">{$home_info.pageName}</a>
{include file="tiki-user_cssmenu.tpl" drilldownmenu='y'}
</li>
</ul>
Modified: trunk/templates/tiki-view_forum.tpl
===================================================================
--- trunk/templates/tiki-view_forum.tpl 2012-08-12 12:49:05 UTC (rev 42569)
+++ trunk/templates/tiki-view_forum.tpl 2012-08-12 12:58:57 UTC (rev 42570)
@@ -202,7 +202,7 @@
<td>{tr}Edit{/tr}
</td>
<td>
- {textarea id='editpost' name="comments_data" _simple="y" _toolbars=$prefs.feature_forum_parse}{$comment_data}{/textarea}
+ {textarea id='editpost' name="comments_data" _simple="y" codemirror="y" syntax="tiki" _toolbars=$prefs.feature_forum_parse}{$comment_data}{/textarea}
</td>
</tr>
{if ($forum_info.att eq 'att_all') or ($forum_info.att eq 'att_admin' and $tiki_p_admin_forum eq 'y') or ($forum_info.att eq 'att_perm' and $tiki_p_forum_attach eq 'y')}
Modified: trunk/templates/tiki-wiki_structure_bar.tpl
===================================================================
--- trunk/templates/tiki-wiki_structure_bar.tpl 2012-08-12 12:49:05 UTC (rev 42569)
+++ trunk/templates/tiki-wiki_structure_bar.tpl 2012-08-12 12:58:57 UTC (rev 42570)
@@ -46,7 +46,6 @@
{else}
</div>
{/if}
- {if $prefs.feature_wiki_structure_drilldownmenu neq 'y'}
{section loop=$structure_path name=ix}
{if $structure_path[ix].parent_id} {$prefs.site_crumb_seper} {/if}
<a href="{sefurl page=$structure_path[ix].pageName structure=$home_info.pageName page_ref_id=$structure_path[ix].page_ref_id}">
@@ -57,7 +56,7 @@
{/if}
</a>
{/section}
- {else}
+ {if $prefs.feature_wiki_structure_drilldownmenu eq 'y'}
{menu structureId=$page_info.structure_id page_id=$page_info.page_id page_name=$page_info.pageName drilldown='y'}
{/if}
</div>
Modified: trunk/tiki-setup_base.php
===================================================================
--- trunk/tiki-setup_base.php 2012-08-12 12:49:05 UTC (rev 42569)
+++ trunk/tiki-setup_base.php 2012-08-12 12:58:57 UTC (rev 42570)
@@ -60,6 +60,7 @@
'min_pass_length' => 5,
'pass_chr_special' => 'n',
'smarty_compilation' => 'modified',
+ 'menus_item_names_raw' => 'n',
);
// check that tiki_preferences is there
if ($tikilib->query("SHOW TABLES LIKE 'tiki_preferences'")->numRows() == 0) {
@@ -238,8 +239,12 @@
$patterns['vars'] = "/^[-_a-zA-Z0-9]*$/"; // for variable keys
$patterns['dotvars'] = "/^[-_a-zA-Z0-9\.]*$/"; // same pattern as a variable key, but that may contain a dot
$patterns['hash'] = "/^[a-z0-9]*$/"; // for hash reqId in live support
-// needed for the htmlpage inclusion in tiki-editpage
-$patterns['url'] = "/^(https?:\/\/)?[^<>\"]*$/"; // needed for the htmlpage inclusion in tiki-editpage
+// allow quotes in url for additional tag attributes if html allowed in menu options links
+if ($prefs['menus_item_names_raw'] == 'y' and strpos($_SERVER["SCRIPT_NAME"], 'tiki-admin_menu_options.php') !== false) {
+$patterns['url'] = "/^(https?:\/\/)?[^<>]*$/";
+} else {
+$patterns['url'] = "/^(https?:\/\/)?[^<>\"]*$/";
+}
// parameter type definitions. prepend a + if variable may not be empty, e.g. '+int'
$vartype['id'] = '+int';
$vartype['forumId'] = '+int';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|