Commit b3f9b305 authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/6.x 30411 to 30464

Caution: find.tpl in conflict - not merged
parent fbe853b1
......@@ -575,7 +575,6 @@ img/icons/admin_search_grey.png -text
img/icons/admin_sections.png -text
img/icons/admin_siteid.png -text
img/icons/admin_siteid_grey.png -text
img/icons/admin_textarea.png -text
img/icons/admin_theme.png -text
img/icons/admin_trackers.png -text
img/icons/admin_trackers_grey.png -text
......@@ -1014,7 +1013,6 @@ img/mytiki/mywatches.gif -text
img/mytiki/news.gif -text
img/mytiki/notes.gif -text
img/mytiki/prefs.gif -text
img/mytiki/socialnetworks_32.png -text
img/mytiki/stock_contact.png -text
img/mytiki/tasks.gif -text
img/mytiki/webmail.gif -text
......@@ -3619,6 +3617,7 @@ pics/large/date.png -text
pics/large/date48x48.png -text
pics/large/display-capplet.png -text
pics/large/display-capplet48x48.png -text
pics/large/editing48x48.png -text
pics/large/evolution.png -text
pics/large/evolution48x48.png -text
pics/large/feed-icon-48x48.png -text
......@@ -3662,6 +3661,8 @@ pics/large/metatags48x48.png -text
pics/large/mplayer48x48.png -text
pics/large/payment.png -text
pics/large/payment48x48.png -text
pics/large/performance.png -text
pics/large/performance48x48.png -text
pics/large/plugins.png -text
pics/large/plugins48x48.png -text
pics/large/profiles.png -text
......@@ -3671,6 +3672,7 @@ pics/large/rating48x48.png -text
pics/large/semantic.png -text
pics/large/semantic48x48.png -text
pics/large/socialnetworks.png -text
pics/large/socialnetworks48x48.png -text
pics/large/stock_about.png -text
pics/large/stock_about48x48.png -text
pics/large/stock_bold.png -text
......
This diff is collapsed.
This diff is collapsed.
......@@ -32,6 +32,7 @@ class Session
if( $prefs['session_lifetime'] > 0 ) {
$qry = "select data from sessions where sesskey = ? and expiry > ?";
$bindvars[] = $prefs['session_lifetime'];
} else {
$qry = "select data from sessions where sesskey = ?";
}
......
......@@ -240,6 +240,8 @@ class TrackerLib extends TikiLib
}
include_once ('lib/webmail/tikimaillib.php');
$smarty->assign('server_name', $_SERVER['SERVER_NAME']);
$desc = $this->get_isMain_value($trackerId, $itemId);
$smarty->assign('mail_item_desc', $desc);
foreach ($watchers as $w) {
$mail = new TikiMail($w['user']);
$mail->setHeader("From", $prefs['sender_email']);
......@@ -294,6 +296,8 @@ class TrackerLib extends TikiLib
}
include_once ('lib/webmail/tikimaillib.php');
$smarty->assign('server_name', $_SERVER['SERVER_NAME']);
$desc = $this->get_isMain_value($trackerId, $itemId);
$smarty->assign('mail_item_desc', $desc);
foreach ($watchers as $w) {
$mail = new TikiMail($w['user']);
$mail->setHeader("From", $prefs['sender_email']);
......
......@@ -17,7 +17,7 @@ function wikiplugin_file_info()
'name' => array(
'required' => false,
'name' => tra('Name'),
'description' => tra("Gives the name of the attached file to link to"),
'description' => tra('Wiki attachment:') . ' ' . tra("Gives the name of the attached file to link to"),
),
'desc' => array(
'required' => false,
......
......@@ -215,7 +215,8 @@ class EditLib
$parsed = preg_replace('/^\s*<p>&nbsp;[\s]*<\/p>\s*/iu','', $parsed); // remove added empty <p>
}
$parsed = preg_replace('/<span class=\"img\">(.*?)<\/span>/im','$1', $parsed); // remove spans round img's
// Workaround Wysiwyg Image Plugin Editor in IE7 erases image on insert http://dev.tiki.org/item3615
$parsed = preg_replace('/(<span class=\"tiki_plugin\".*?plugin=\"img\".*?><\/span>)<\/p>/is','$1<span>&nbsp;</span></p>', $parsed);
// Fix IE7 wysiwyg editor always adding absolute path
$search = '/(<a[^>]+href=\")https?\:\/\/' . preg_quote($_SERVER['HTTP_HOST'].$tikiroot, '/') . '([^>]+_cke_saved_href)/i';
$parsed = preg_replace($search, '$1$2', $parsed);
......
pics/large/feed-icon-48x48.png

3.46 KB | W: | H:

pics/large/feed-icon-48x48.png

3.34 KB | W: | H:

pics/large/feed-icon-48x48.png
pics/large/feed-icon-48x48.png
pics/large/feed-icon-48x48.png
pics/large/feed-icon-48x48.png
  • 2-up
  • Swipe
  • Onion skin
pics/large/feed-icon.png

1.74 KB | W: | H:

pics/large/feed-icon.png

1.94 KB | W: | H:

pics/large/feed-icon.png
pics/large/feed-icon.png
pics/large/feed-icon.png
pics/large/feed-icon.png
  • 2-up
  • Swipe
  • Onion skin
pics/large/gnome-lockscreen48x48.png

1.76 KB | W: | H:

pics/large/gnome-lockscreen48x48.png

3.28 KB | W: | H:

pics/large/gnome-lockscreen48x48.png
pics/large/gnome-lockscreen48x48.png
pics/large/gnome-lockscreen48x48.png
pics/large/gnome-lockscreen48x48.png
  • 2-up
  • Swipe
  • Onion skin
pics/large/intertiki.png

2.23 KB | W: | H:

pics/large/intertiki.png

1.78 KB | W: | H:

pics/large/intertiki.png
pics/large/intertiki.png
pics/large/intertiki.png
pics/large/intertiki.png
  • 2-up
  • Swipe
  • Onion skin
pics/large/intertiki48x48.png

5.44 KB | W: | H:

pics/large/intertiki48x48.png

2.9 KB | W: | H:

pics/large/intertiki48x48.png
pics/large/intertiki48x48.png
pics/large/intertiki48x48.png
pics/large/intertiki48x48.png
  • 2-up
  • Swipe
  • Onion skin
pics/large/maps.png

2.65 KB | W: | H:

pics/large/maps.png

1.85 KB | W: | H:

pics/large/maps.png
pics/large/maps.png
pics/large/maps.png
pics/large/maps.png
  • 2-up
  • Swipe
  • Onion skin
pics/large/maps48x48.png

5.53 KB | W: | H:

pics/large/maps48x48.png

3 KB | W: | H:

pics/large/maps48x48.png
pics/large/maps48x48.png
pics/large/maps48x48.png
pics/large/maps48x48.png
  • 2-up
  • Swipe
  • Onion skin
pics/large/semantic.png

2.17 KB | W: | H:

pics/large/semantic.png

1.34 KB | W: | H:

pics/large/semantic.png
pics/large/semantic.png
pics/large/semantic.png
pics/large/semantic.png
  • 2-up
  • Swipe
  • Onion skin
pics/large/semantic48x48.png

3.37 KB | W: | H:

pics/large/semantic48x48.png

2.1 KB | W: | H:

pics/large/semantic48x48.png
pics/large/semantic48x48.png
pics/large/semantic48x48.png
pics/large/semantic48x48.png
  • 2-up
  • Swipe
  • Onion skin
pics/large/socialnetworks.png

26.1 KB | W: | H:

pics/large/socialnetworks.png

2.66 KB | W: | H:

pics/large/socialnetworks.png
pics/large/socialnetworks.png
pics/large/socialnetworks.png
pics/large/socialnetworks.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -14,13 +14,13 @@
{self_link page="i18n" _class="icon tips" _title="{tr}i18n{/tr}|{tr}Internationalization and localization - mulitlingual features{/tr}"}{icon _id="pics/large/i18n.png" alt="{tr}i18n{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
{self_link page="textarea" _class="icon tips" _title="{tr}Editing and Plugins{/tr}|{tr}Text editing settings applicable to many areas. Plugin activation and plugin alias management{/tr}"}{icon _id="img/icons/admin_textarea.png" alt="{tr}Editing and Plugins{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
{self_link page="textarea" _class="icon tips" _title="{tr}Editing and Plugins{/tr}|{tr}Text editing settings applicable to many areas. Plugin activation and plugin alias management{/tr}"}{icon _id="pics/large/editing48x48.png" alt="{tr}Editing and Plugins{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
{self_link page="module" _class="icon tips" _title="{tr}Module{/tr}|{tr}Module appearance settings{/tr}"}{icon _id="pics/large/display-capplet.png" alt="{tr}Module{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
{self_link page="metatags" _class="icon tips" _title="{tr}Meta Tags{/tr}|{tr}Information to include in the header of each page{/tr}"}{icon _id="pics/large/metatags.png" alt="{tr}Meta Tags{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
{self_link page="performance" _class="icon tips" _title="{tr}Performance{/tr}|{tr}Server performance settings{/tr}"}{icon _id="img/mytiki/admin.gif" alt="{tr}Performance{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
{self_link page="performance" _class="icon tips" _title="{tr}Performance{/tr}|{tr}Server performance settings{/tr}"}{icon _id="pics/large/performance.png" alt="{tr}Performance{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
{self_link page="security" _class="security tips" _title="{tr}Security{/tr}|{tr}Site security settings{/tr}"}{icon _id="pics/large/gnome-lockscreen48x48.png" alt="{tr}Security{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
......@@ -147,7 +147,7 @@
{/if}
{if $prefs.feature_socialnetworks eq 'y'}
{self_link page="socialnetworks" _class="icon tips" _title="{tr}Social networks{/tr}|{tr}Configure social networks integration{/tr}"}{icon _id="img/mytiki/socialnetworks_32.png" alt="{tr}Social networks{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
{self_link page="socialnetworks" _class="icon tips" _title="{tr}Social networks{/tr}|{tr}Configure social networks integration{/tr}"}{icon _id="pics/large/socialnetworks.png" alt="{tr}Social networks{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
{/if}
{if $prefs.ajax_xajax eq 'y' and $prefs.feature_jquery_reflection eq 'y'}{jq}$('img.reflect').reflect({});{/jq}{/if}{* for ajax *}
......
......@@ -23,13 +23,13 @@
{self_link page="i18n" _class="admbox" _style="background-image: url('pics/large/i18n48x48.png')" _title="{tr}i18n{/tr}"}<span>{tr}i18n{/tr}</span>{/self_link}
{self_link page="textarea" _class="admbox" _style="background-image: url('img/icons/admin_textarea.png')" _title="{tr}Editing and Plugins{/tr}"}<span>{tr}Editing and Plugins{/tr}</span>{/self_link}
{self_link page="textarea" _class="admbox" _style="background-image: url('pics/large/editing48x48.png')" _title="{tr}Editing and Plugins{/tr}"}<span>{tr}Editing and Plugins{/tr}</span>{/self_link}
{self_link page="module" _class="admbox" _style="background-image: url('pics/large/display-capplet48x48.png')" _title="{tr}Module{/tr}"}<span>{tr}Module{/tr}</span>{/self_link}
{self_link page="metatags" _class="admbox" _style="background-image: url('pics/large/metatags48x48.png')" _title="{tr}Meta Tags{/tr}"}<span>{tr}Meta Tags{/tr}</span>{/self_link}
{self_link page="performance" _class="admbox" _style="background-image: url('img/mytiki/admin.gif')" _title="{tr}Performance{/tr}"}<span>{tr}Performance{/tr}</span>{/self_link}
{self_link page="performance" _class="admbox" _style="background-image: url('pics/large/performance48x48.png')" _title="{tr}Performance{/tr}"}<span>{tr}Performance{/tr}</span>{/self_link}
{self_link page="security" _class="admbox" _style="background-image: url('pics/large/gnome-lockscreen48x48.png')" _title="{tr}Security{/tr}"}<span>{tr}Security{/tr}</span>{/self_link}
......@@ -96,6 +96,6 @@
{self_link page="payment" _class="admbox" _style="background-image: url('pics/large/payment48x48.png')" _selected="'`$prefs.payment_feature`' != 'y'" _selected_class="admbox off"}<img src="pics/trans.png" alt="{tr}Payment{/tr}" title="{tr}Payment{/tr}{if $prefs.payment_feature ne 'y'} ({tr}Disabled{/tr}){/if}" /><span>{tr}Payment{/tr}</span>{/self_link}
{self_link page="socialnetworks" _class="admbox" _style="background-image: url('img/mytiki/socialnetworks_32.png')" _selected="'`$prefs.feature_socialnetworks`' != 'y'" _selected_class="admbox off"}<img src="pics/trans.png" alt="{tr}Social Networks{/tr}" title="{tr}Social networks{/tr}{if $prefs.feature_socialnetworks ne 'y'} ({tr}Disabled{/tr}){/if}" /><span>{tr}Social networks{/tr}</span>{/self_link}
{self_link page="socialnetworks" _class="admbox" _style="background-image: url('pics/large/socialnetworks48x48.png')" _selected="'`$prefs.feature_socialnetworks`' != 'y'" _selected_class="admbox off"}<img src="pics/trans.png" alt="{tr}Social Networks{/tr}" title="{tr}Social networks{/tr}{if $prefs.feature_socialnetworks ne 'y'} ({tr}Disabled{/tr}){/if}" /><span>{tr}Social networks{/tr}</span>{/self_link}
</div>
......@@ -6,7 +6,7 @@
{tabset name='tabs_wikipages'}
{tab name="{tr}List Wiki Pages{/tr}"}
{include file='find.tpl' find_show_languages='y' find_show_categories_multi='y' find_show_num_rows='y'}
{include file='find.tpl' find_show_languages='y' find_show_languages_excluded='y' find_show_categories_multi='y' find_show_num_rows='y'}
<form name="checkform" method="get" action="{$smarty.server.PHP_SELF}">
<input type="hidden" name="offset" value="{$offset|escape}" />
......
......@@ -59,7 +59,7 @@
{/if}
{if $prefs.feature_socialnetworks == 'y' and !empty($user) and ($tiki_p_socialnetworks eq 'y' or $tiki_p_admin_socialnetworks eq 'y')}
{button _icon="img/mytiki/socialnetworks_32.png" _text="{tr}Social networks{/tr}" href="tiki-socialnetworks.php" _menu_text="y}
{button _icon="pics/large/socialnetworks.png" _text="{tr}Social networks{/tr}" href="tiki-socialnetworks.php" _menu_text="y}
{/if}
</div>
......
......@@ -161,7 +161,7 @@
{if $forumId}<input type="hidden" name="forumId" value="{$forumId|escape}" />{/if}
{/if}
<label class="findsubmit">
<input type="submit" name="search" value="{tr}Go{/tr}"/>
<input type="submit" name="search" value="{tr}Go{/tr}" />
</label>
{if !$searchNoResults}
{button _auto_args='highlight' href="tiki-searchresults.php?highlight=" _text="{tr}Clear Filter{/tr}"}
......
......@@ -74,7 +74,7 @@ if (($tiki_p_admin == 'y') || ($tiki_p_admin_cms == 'y')) {
} else {
$date_max = $tikilib->now;
}
if (isset($_REQUEST["find_from_Month"]) && isset($_REQUEST["find_from_Day"]) && isset($_REQUEST["find_from_Year"])) {
if (!empty($_REQUEST["find_from_Month"]) && !empty($_REQUEST["find_from_Day"]) && !empty($_REQUEST["find_from_Year"])) {
$date_min = $tikilib->make_time(0, 0, 0, $_REQUEST["find_from_Month"], $_REQUEST["find_from_Day"], $_REQUEST["find_from_Year"]);
$smarty->assign('find_date_from', $date_min);
} else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment