Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[56469] trunk
|
From: <li...@us...> - 2015-10-11 14:59:54
|
Revision: 56469
http://sourceforge.net/p/tikiwiki/code/56469
Author: lindonb
Date: 2015-10-11 14:59:52 +0000 (Sun, 11 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56464 to 56468
Modified Paths:
--------------
trunk/lib/breadcrumblib.php
trunk/lib/parser/parserlib.php
trunk/lib/wiki-plugins/wikiplugin_img.php
trunk/tiki-map.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-11 14:59:02 UTC (rev 56468)
+++ trunk 2015-10-11 14:59:52 UTC (rev 56469)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56464
+/branches/14.x:54079-56468
/branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
\ No newline at end of property
Modified: trunk/lib/breadcrumblib.php
===================================================================
--- trunk/lib/breadcrumblib.php 2015-10-11 14:59:02 UTC (rev 56468)
+++ trunk/lib/breadcrumblib.php 2015-10-11 14:59:52 UTC (rev 56469)
@@ -373,8 +373,9 @@
}
$ret .= help_doclink(array('crumb'=>$crumbs[$len-1]));
if ( isset($info['flag']) && $info['flag'] == 'L' && $print_page != 'y' ) {
- $ret .= ' <img src="img/icons/lock.png" height="16" width="16" alt="' .
- tra('locked') . '" title="' . tra('locked by') . ' ' . $info['user'] . '" />';
+ $smarty->loadPlugin('smarty_function_icon');
+ $ret .= smarty_function_icon(['name' => 'lock', 'iclass' => 'tips', 'ititle' => ':' . tra('Locked by')
+ . $info['user']], $smarty);
}
return $ret;
}
Modified: trunk/lib/parser/parserlib.php
===================================================================
--- trunk/lib/parser/parserlib.php 2015-10-11 14:59:02 UTC (rev 56468)
+++ trunk/lib/parser/parserlib.php 2015-10-11 14:59:52 UTC (rev 56469)
@@ -517,7 +517,7 @@
if ( $this->plugin_is_editable($plugin_name) && (empty($this->option['preview_mode']) || !$this->option['preview_mode']) && empty($this->option['indexing']) && (empty($this->option['print']) || !$this->option['print']) && !$this->option['suppress_icons'] ) {
$headerlib = TikiLib::lib('header');
- include_once('lib/smarty_tiki/function.icon.php');
+ $smarty->loadPlugin('smarty_function_icon');
$id = 'plugin-edit-' . $plugin_name . $current_index;
@@ -551,7 +551,9 @@
}
}
- $ret .= '~np~<a id="' .$id. '" href="javascript:void(1)" class="editplugin"'.$iconDisplayStyle.'>'.smarty_function_icon(array('name'=>'plugin', 'alt'=>tra('Edit Plugin').':'.$plugin_name), $smarty)."</a>~/np~";
+ $ret .= '~np~<a id="' . $id . '" href="javascript:void(1)" class="editplugin"' . $iconDisplayStyle . '>'
+ . smarty_function_icon(array('name'=>'plugin', 'iclass' => 'tips', 'ititle'=>tra('Edit plugin')
+ . ':' . ucfirst($plugin_name)), $smarty)."</a>~/np~";
}
// End plugin handling
Modified: trunk/lib/wiki-plugins/wikiplugin_img.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_img.php 2015-10-11 14:59:02 UTC (rev 56468)
+++ trunk/lib/wiki-plugins/wikiplugin_img.php 2015-10-11 14:59:52 UTC (rev 56469)
@@ -489,6 +489,7 @@
global $tikidomain, $prefs, $user;
$userlib = TikiLib::lib('user');
$smarty = TikiLib::lib('smarty');
+ $smarty->loadPlugin('smarty_function_icon');
$imgdata = array();
@@ -1331,13 +1332,14 @@
if (!empty($titleonly)) {
$repl .= ' title="' . $titleonly . '"';
}
- $repl .= ">\r\t\t\t\t" . '<img class="magnify" src="./img/icons/magnifier.png" alt="'.tra('Enlarge').'" /></a>' . "\r\t\t\t</div>";
+ $repl .= ">\r\t\t\t\t" . smarty_function_icon(['name' => 'view', 'iclass' => 'tips',
+ 'ititle' => ':' . tra('Enlarge')], $smarty) . '</a>' . "\r\t\t\t</div>";
}
//Add metadata icon
if ($imgdata['metadata'] == 'view') {
$repl .= '<div style="float:right; margin-right:2px"><a href="#" id="' . $id_link
- . '"><img src="./img/icons/tag_orange.png" alt="' . tra('Metadata') . '" title="'
- . tra('Metadata') . '"/></a></div>';
+ . '" class="tips" title=":' . tra('Metadata') . '">' . smarty_function_icon(['name' => 'tag'], $smarty)
+ . '</a></div>';
}
//Add description based on user setting (use $desconly from above) and close divs
isset($desconly) ? $repl .= $desconly : '';
@@ -1450,10 +1452,12 @@
$iconDisplayStyle = '';
}
$jsonParams = json_encode(array_filter($imgdata));
- $repl .= "<a href=\"tiki-edit_draw.php?fileId={$imgdata['fileId']}\" onclick=\"return $(this).ajaxEditDraw();\" title=\"".tr("Draw on the Image") . "\"" .
- " class=\"editplugin pluginImgEdit{$imgdata['fileId']}\" data-fileid=\"{$imgdata['fileId']}\" " .
- "data-galleryid=\"{$dbinfo['galleryId']}\"{$iconDisplayStyle} data-imgparams='$jsonParams'>" .
- "<img width='16' height='16' class='icon' alt='Edit' src='img/icons/page_edit.png' /></a>";
+ $repl .= "<a href=\"tiki-edit_draw.php?fileId={$imgdata['fileId']}\" onclick=\"return $(this).ajaxEditDraw();\" title=\""
+ . tr("Draw on the Image") . "\"" .
+ " class=\"editplugin pluginImgEdit{$imgdata['fileId']}\" data-fileid=\"{$imgdata['fileId']}\" " .
+ "data-galleryid=\"{$dbinfo['galleryId']}\"{$iconDisplayStyle} data-imgparams='$jsonParams'>" .
+ smarty_function_icon(['name' => 'edit', 'iclass' => 'tips', 'ititle' => ':' . tra('Edit')], $smarty)
+ . '</a>';
}
}
Modified: trunk/tiki-map.php
===================================================================
--- trunk/tiki-map.php 2015-10-11 14:59:02 UTC (rev 56468)
+++ trunk/tiki-map.php 2015-10-11 14:59:52 UTC (rev 56469)
@@ -137,7 +137,8 @@
$msg.= "<pre/><br />";
if ($tiki_p_map_edit == 'y') {
$msg.= '<a class="link" href="tiki-map_edit.php?mapfile=' . $mapfile . '&mode=editing">';
- $msg.= '<img src="img/icons/wrench.png" alt="' . tra("edit") . '" title="' . tra("edit") . '" width="16" height="16" />';
+ $smarty->loadPlugin('smarty_function_icon');
+ $msg.= smarty_function_icon(['name' => 'settings', 'iclass' => 'tips', 'ititle' => ':' . tra('Edit')], $smarty);
$msg.= '</a>';
}
$smarty->assign('msg', $msg);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|