From e1599b59fc39fd99be5cf879f922989ec4e4f0f2 Mon Sep 17 00:00:00 2001 From: gezzzan <gezzzan@users.sourceforge.net> Date: Sun, 4 Mar 2012 21:22:53 +0000 Subject: [PATCH] [MOD] ImgDirectoryRevamp - switching in files from pics/icons to img/icons --- lib/breadcrumblib.php | 2 +- lib/ckeditor_tiki/plugins/_tikilink/plugin.js | 6 +- .../plugins/tikiplugin/plugin.js | 2 +- lib/core/Tracker/Field/Files.php | 2 +- lib/jquery_tiki/brosho/tiki_brosho.js | 2 +- lib/jquery_tiki/tiki-jquery.js | 12 +- lib/jquery_tiki/tiki-trackers.js | 2 +- lib/modules/tiki-admin_modules.js | 4 +- lib/parser/parserlib.php | 4 +- lib/registration/register_ajax.js | 4 +- lib/setup/wiki.php | 4 +- lib/smarty_tiki/function.icon.php | 4 +- lib/smarty_tiki/function.listfilter.php | 2 +- lib/tiki-js-sorttable.js | 4 +- lib/tiki-js.js | 24 ++-- lib/tikihelplib.php | 2 +- lib/toolbars/tiki-admin_toolbars.js | 2 +- lib/toolbars/toolbarslib.php | 114 +++++++++--------- lib/wiki-plugins/wikiplugin_addtocart.php | 2 +- .../wikiplugin_addtogooglecal.php | 2 +- lib/wiki-plugins/wikiplugin_agentinfo.php | 2 +- lib/wiki-plugins/wikiplugin_alink.php | 2 +- lib/wiki-plugins/wikiplugin_aname.php | 2 +- lib/wiki-plugins/wikiplugin_annotation.php | 2 +- lib/wiki-plugins/wikiplugin_article.php | 4 +- lib/wiki-plugins/wikiplugin_articles.php | 2 +- lib/wiki-plugins/wikiplugin_attach.php | 2 +- lib/wiki-plugins/wikiplugin_attributes.php | 2 +- lib/wiki-plugins/wikiplugin_author.php | 2 +- lib/wiki-plugins/wikiplugin_avatar.php | 2 +- lib/wiki-plugins/wikiplugin_back.php | 2 +- lib/wiki-plugins/wikiplugin_backlinks.php | 2 +- lib/wiki-plugins/wikiplugin_banner.php | 2 +- lib/wiki-plugins/wikiplugin_bigbluebutton.php | 2 +- lib/wiki-plugins/wikiplugin_bliptv.php | 2 +- lib/wiki-plugins/wikiplugin_bloglist.php | 2 +- lib/wiki-plugins/wikiplugin_box.php | 2 +- lib/wiki-plugins/wikiplugin_button.php | 2 +- lib/wiki-plugins/wikiplugin_calendar.php | 2 +- lib/wiki-plugins/wikiplugin_carousel.php | 2 +- lib/wiki-plugins/wikiplugin_category.php | 2 +- lib/wiki-plugins/wikiplugin_catorphans.php | 2 +- lib/wiki-plugins/wikiplugin_catpath.php | 2 +- lib/wiki-plugins/wikiplugin_cclite.php | 2 +- lib/wiki-plugins/wikiplugin_center.php | 2 +- lib/wiki-plugins/wikiplugin_chart.php | 2 +- lib/wiki-plugins/wikiplugin_code.php | 2 +- lib/wiki-plugins/wikiplugin_colorbox.php | 2 +- lib/wiki-plugins/wikiplugin_comment.php | 2 +- lib/wiki-plugins/wikiplugin_content.php | 2 +- .../wikiplugin_contributionsdashboard.php | 2 +- lib/wiki-plugins/wikiplugin_convene.php | 20 +-- lib/wiki-plugins/wikiplugin_cookie.php | 2 +- lib/wiki-plugins/wikiplugin_copyright.php | 2 +- lib/wiki-plugins/wikiplugin_countdown.php | 2 +- lib/wiki-plugins/wikiplugin_customsearch.php | 2 +- lib/wiki-plugins/wikiplugin_datachannel.php | 2 +- lib/wiki-plugins/wikiplugin_dbreport.php | 2 +- lib/wiki-plugins/wikiplugin_div.php | 2 +- lib/wiki-plugins/wikiplugin_dl.php | 2 +- lib/wiki-plugins/wikiplugin_draw.php | 4 +- lib/wiki-plugins/wikiplugin_equation.php | 2 +- lib/wiki-plugins/wikiplugin_events.php | 2 +- lib/wiki-plugins/wikiplugin_fade.php | 2 +- lib/wiki-plugins/wikiplugin_fancylist.php | 2 +- lib/wiki-plugins/wikiplugin_fancytable.php | 2 +- lib/wiki-plugins/wikiplugin_file.php | 2 +- lib/wiki-plugins/wikiplugin_footnote.php | 2 +- lib/wiki-plugins/wikiplugin_footnotearea.php | 2 +- lib/wiki-plugins/wikiplugin_freetagged.php | 2 +- lib/wiki-plugins/wikiplugin_ftp.php | 2 +- lib/wiki-plugins/wikiplugin_gauge.php | 2 +- .../wikiplugin_googleanalytics.php | 2 +- lib/wiki-plugins/wikiplugin_googledoc.php | 2 +- lib/wiki-plugins/wikiplugin_googlemap.php | 2 +- lib/wiki-plugins/wikiplugin_group.php | 2 +- lib/wiki-plugins/wikiplugin_groupexpiry.php | 2 +- lib/wiki-plugins/wikiplugin_grouplist.php | 2 +- lib/wiki-plugins/wikiplugin_groupmailcore.php | 2 +- lib/wiki-plugins/wikiplugin_groupstat.php | 2 +- lib/wiki-plugins/wikiplugin_htmlfeed.php | 2 +- lib/wiki-plugins/wikiplugin_htmlfeedlink.php | 6 +- lib/wiki-plugins/wikiplugin_iframe.php | 2 +- lib/wiki-plugins/wikiplugin_img.php | 8 +- lib/wiki-plugins/wikiplugin_include.php | 2 +- lib/wiki-plugins/wikiplugin_invite.php | 2 +- lib/wiki-plugins/wikiplugin_jabber.php | 2 +- lib/wiki-plugins/wikiplugin_jq.php | 2 +- lib/wiki-plugins/wikiplugin_js.php | 2 +- lib/wiki-plugins/wikiplugin_kaltura.php | 2 +- lib/wiki-plugins/wikiplugin_lang.php | 2 +- lib/wiki-plugins/wikiplugin_lastmod.php | 2 +- lib/wiki-plugins/wikiplugin_list.php | 2 +- lib/wiki-plugins/wikiplugin_listpages.php | 2 +- lib/wiki-plugins/wikiplugin_lsdir.php | 2 +- lib/wiki-plugins/wikiplugin_mail.php | 2 +- lib/wiki-plugins/wikiplugin_map.php | 2 +- lib/wiki-plugins/wikiplugin_mcalendar.php | 2 +- lib/wiki-plugins/wikiplugin_memberlist.php | 2 +- lib/wiki-plugins/wikiplugin_memberpayment.php | 2 +- lib/wiki-plugins/wikiplugin_miniquiz.php | 2 +- lib/wiki-plugins/wikiplugin_module.php | 2 +- lib/wiki-plugins/wikiplugin_mono.php | 2 +- lib/wiki-plugins/wikiplugin_mouseover.php | 2 +- lib/wiki-plugins/wikiplugin_mwtable.php | 2 +- lib/wiki-plugins/wikiplugin_myspace.php | 2 +- lib/wiki-plugins/wikiplugin_now.php | 2 +- lib/wiki-plugins/wikiplugin_objecthits.php | 2 +- lib/wiki-plugins/wikiplugin_param.php | 2 +- lib/wiki-plugins/wikiplugin_payment.php | 2 +- lib/wiki-plugins/wikiplugin_perm.php | 4 +- lib/wiki-plugins/wikiplugin_pluginmanager.php | 2 +- lib/wiki-plugins/wikiplugin_poll.php | 2 +- lib/wiki-plugins/wikiplugin_profile.php | 2 +- lib/wiki-plugins/wikiplugin_proposal.php | 2 +- lib/wiki-plugins/wikiplugin_quote.php | 2 +- lib/wiki-plugins/wikiplugin_randominclude.php | 2 +- lib/wiki-plugins/wikiplugin_rcontent.php | 2 +- lib/wiki-plugins/wikiplugin_realnamelist.php | 2 +- lib/wiki-plugins/wikiplugin_redirect.php | 2 +- lib/wiki-plugins/wikiplugin_regex.php | 2 +- lib/wiki-plugins/wikiplugin_remarksbox.php | 2 +- lib/wiki-plugins/wikiplugin_report.php | 2 +- lib/wiki-plugins/wikiplugin_rss.php | 2 +- lib/wiki-plugins/wikiplugin_scroll.php | 2 +- lib/wiki-plugins/wikiplugin_sf.php | 2 +- lib/wiki-plugins/wikiplugin_sharethis.php | 2 +- lib/wiki-plugins/wikiplugin_sheet.php | 2 +- lib/wiki-plugins/wikiplugin_showpages.php | 2 +- lib/wiki-plugins/wikiplugin_slider.php | 2 +- lib/wiki-plugins/wikiplugin_slideshow.php | 2 +- lib/wiki-plugins/wikiplugin_smarty.php | 2 +- lib/wiki-plugins/wikiplugin_snarf.php | 2 +- lib/wiki-plugins/wikiplugin_sort.php | 2 +- lib/wiki-plugins/wikiplugin_split.php | 4 +- lib/wiki-plugins/wikiplugin_sql.php | 2 +- lib/wiki-plugins/wikiplugin_stat.php | 2 +- lib/wiki-plugins/wikiplugin_sub.php | 2 +- .../wikiplugin_subscribegroup.php | 2 +- .../wikiplugin_subscribegroups.php | 2 +- .../wikiplugin_subscribenewsletter.php | 2 +- lib/wiki-plugins/wikiplugin_sup.php | 2 +- lib/wiki-plugins/wikiplugin_survey.php | 2 +- lib/wiki-plugins/wikiplugin_tabs.php | 2 +- lib/wiki-plugins/wikiplugin_tag.php | 2 +- lib/wiki-plugins/wikiplugin_textlink.php | 2 +- lib/wiki-plugins/wikiplugin_timeline.php | 2 +- lib/wiki-plugins/wikiplugin_timesheet.php | 2 +- lib/wiki-plugins/wikiplugin_titlesearch.php | 2 +- lib/wiki-plugins/wikiplugin_toc.php | 2 +- lib/wiki-plugins/wikiplugin_topfriends.php | 2 +- lib/wiki-plugins/wikiplugin_tr.php | 2 +- lib/wiki-plugins/wikiplugin_tracker.php | 6 +- .../wikiplugin_trackercomments.php | 2 +- lib/wiki-plugins/wikiplugin_trackerif.php | 2 +- .../wikiplugin_trackeritemfield.php | 2 +- lib/wiki-plugins/wikiplugin_trackerlist.php | 2 +- .../wikiplugin_trackerprefill.php | 2 +- lib/wiki-plugins/wikiplugin_trackerstat.php | 2 +- .../wikiplugin_trackertimeline.php | 2 +- lib/wiki-plugins/wikiplugin_trade.php | 2 +- lib/wiki-plugins/wikiplugin_transclude.php | 2 +- lib/wiki-plugins/wikiplugin_translated.php | 2 +- lib/wiki-plugins/wikiplugin_twitter.php | 2 +- lib/wiki-plugins/wikiplugin_usercount.php | 2 +- lib/wiki-plugins/wikiplugin_userlink.php | 2 +- lib/wiki-plugins/wikiplugin_userlist.php | 2 +- lib/wiki-plugins/wikiplugin_userpref.php | 2 +- lib/wiki-plugins/wikiplugin_versions.php | 2 +- lib/wiki-plugins/wikiplugin_vimeo.php | 2 +- lib/wiki-plugins/wikiplugin_vote.php | 2 +- lib/wiki-plugins/wikiplugin_wantedpages.php | 2 +- lib/wiki-plugins/wikiplugin_watershed.php | 2 +- lib/wiki-plugins/wikiplugin_webservice.php | 2 +- lib/wiki-plugins/wikiplugin_youtube.php | 2 +- styles/layout/design.css | 14 +-- styles/layout/layout.css | 4 +- templates/admin/include_profiles.tpl | 2 +- templates/map/tiki-map.tpl | 10 +- templates/map/tiki-map_edit.tpl | 12 +- templates/map/tiki-map_frame.tpl | 4 +- templates/map/tiki-map_upload.tpl | 6 +- templates/modules/mod-assistant.tpl | 10 +- templates/modules/mod-calendar_new.tpl | 2 +- templates/modules/mod-rsslist.tpl | 18 +-- templates/modules/mod-upcoming_events.tpl | 2 +- templates/tiki-admin_menu_options.tpl | 2 +- templates/tiki-admin_menus.tpl | 4 +- templates/tiki-admin_metrics.tpl | 14 +-- .../tiki-admin_newsletter_subscriptions.tpl | 2 +- templates/tiki-admin_notifications.tpl | 2 +- templates/tiki-calendar_daymode.tpl | 2 +- templates/tiki-calendar_weekmode.tpl | 4 +- templates/tiki-change_password.tpl | 6 +- templates/tiki-edit_help.tpl | 32 ++--- templates/tiki-edit_help_wysiwyg.tpl | 2 +- templates/tiki-edit_templates.tpl | 2 +- templates/tiki-install.tpl | 64 +++++----- templates/tiki-list_cache.tpl | 6 +- .../tiki-list_kaltura_entries_actions.tpl | 10 +- templates/tiki-list_kaltura_mix_entries.tpl | 2 +- templates/tiki-read_article.tpl | 4 +- templates/tiki-sheets_listing.tpl | 2 +- templates/tiki-show_page_raw.tpl | 12 +- templates/tiki-view_forum.tpl | 10 +- tiki-browse_categories.php | 10 +- tiki-map.php | 2 +- 207 files changed, 414 insertions(+), 414 deletions(-) diff --git a/lib/breadcrumblib.php b/lib/breadcrumblib.php index b2014479dae..0fd6da586d9 100644 --- a/lib/breadcrumblib.php +++ b/lib/breadcrumblib.php @@ -290,7 +290,7 @@ function _breadcrumb_getTitle($crumbs, $loc) } $ret .= help_doclink(array('crumb'=>$crumbs[$len-1])); if ( isset($info['flag']) && $info['flag'] == 'L' && $print_page != 'y' ) { - $ret .= ' <img src="pics/icons/lock.png" height="16" width="16" alt="' . + $ret .= ' <img src="img/icons/lock.png" height="16" width="16" alt="' . tra('locked') . '" title="' . tra('locked by') . ' ' . $info['user'] . '" />'; } if ( $prefs['feature_breadcrumbs'] == 'n' || $prefs['feature_sitetitle'] == 'title' ) { diff --git a/lib/ckeditor_tiki/plugins/_tikilink/plugin.js b/lib/ckeditor_tiki/plugins/_tikilink/plugin.js index d374b2c108a..d9add692b33 100644 --- a/lib/ckeditor_tiki/plugins/_tikilink/plugin.js +++ b/lib/ckeditor_tiki/plugins/_tikilink/plugin.js @@ -21,13 +21,13 @@ CKEDITOR.plugins.add( 'tikilink', { label : 'TikiLink', command : 'tikilink', - icon: editor.config._TikiRoot + 'pics/icons/page_link.png' + icon: editor.config._TikiRoot + 'img/icons/page_link.png' }); // Add the CSS styles for anchor placeholders. editor.addCss( 'img.cke_tikilink {' + - 'background-image: url("' + editor.config._TikiRoot + 'pics/icons/page_link.png");' + + 'background-image: url("' + editor.config._TikiRoot + 'img/icons/page_link.png");' + 'background-position: center center;' + 'background-repeat: no-repeat;' + 'border: 1px solid #a9a9a9;' + @@ -35,7 +35,7 @@ CKEDITOR.plugins.add( 'tikilink', 'height: 18px !important;' + '}\n' + 'a.cke_tikilink {' + - 'background-image: url("' + editor.config._TikiRoot + 'pics/icons/page_link.png");' + + 'background-image: url("' + editor.config._TikiRoot + 'img/icons/page_link.png");' + 'background-position: 0 center;' + 'background-repeat: no-repeat;' + 'border: 1px solid #a9a9a9;' + diff --git a/lib/ckeditor_tiki/plugins/tikiplugin/plugin.js b/lib/ckeditor_tiki/plugins/tikiplugin/plugin.js index dd87072530c..98d965a4848 100644 --- a/lib/ckeditor_tiki/plugins/tikiplugin/plugin.js +++ b/lib/ckeditor_tiki/plugins/tikiplugin/plugin.js @@ -67,7 +67,7 @@ label : 'Tiki Plugin', command : 'tikiplugin', group : 'tiki', - icon : CKEDITOR.config._TikiRoot + 'pics/icons/plugin_edit.png' + icon : CKEDITOR.config._TikiRoot + 'img/icons/plugin_edit.png' } }); } diff --git a/lib/core/Tracker/Field/Files.php b/lib/core/Tracker/Field/Files.php index 6c2a0494163..07c9496389f 100644 --- a/lib/core/Tracker/Field/Files.php +++ b/lib/core/Tracker/Field/Files.php @@ -194,7 +194,7 @@ class Tracker_Field_Files extends Tracker_Field_Abstract $file['filetype'] == $mimetypes["tiff"]) ) { $ret .= " <a href='tiki-edit_draw.php?fileId=" . $file['fileId'] . "' onclick='return $(this).ajaxEditDraw();' title='Edit: ".$file['name']."' data-fileid='".$file['fileId']."' data-galleryid='".$file['galleryId']."'> - <img width='16' height='16' class='icon' alt='Edit' src='pics/icons/page_edit.png' /> + <img width='16' height='16' class='icon' alt='Edit' src='img/icons/page_edit.png' /> </a>"; } diff --git a/lib/jquery_tiki/brosho/tiki_brosho.js b/lib/jquery_tiki/brosho/tiki_brosho.js index a688a385921..3a46033da72 100644 --- a/lib/jquery_tiki/brosho/tiki_brosho.js +++ b/lib/jquery_tiki/brosho/tiki_brosho.js @@ -9,7 +9,7 @@ function toggle_brosho() { elementHoverClass: "custom-hover", //a custom hover class editorOpacity: 0.8 //full opacity on editor }); - $("#brosho-selector").prepend($("<img src='pics/icons/close.png' style='float:right;' />").click(function(){ + $("#brosho-selector").prepend($("<img src='img/icons/close.png' style='float:right;' />").click(function(){ $('#brosho-wrapper, #brosho-overlay-wrapper').remove(); //remove old stuff $('body *').unbind(); //unbind the previous hover event handler on every element within the body })); diff --git a/lib/jquery_tiki/tiki-jquery.js b/lib/jquery_tiki/tiki-jquery.js index 706ebf91476..0c51cb16e63 100644 --- a/lib/jquery_tiki/tiki-jquery.js +++ b/lib/jquery_tiki/tiki-jquery.js @@ -987,7 +987,7 @@ function toggleFullScreen(area_id) { $("#diff_history").height(h - vh).width(w).css("left", w + grippy_width); $edit_form.css("position","absolute").css("left", w + grippy_width).width(w - grippy_width); - var $grippy = $("<div id='fs_grippy_" + area_id +"' />").css({"background-image": "url(pics/icons/shading.png)", + var $grippy = $("<div id='fs_grippy_" + area_id +"' />").css({"background-image": "url(img/icons/shading.png)", "background-repeat": "repeat-y", "background-position": -3, "position": "absolute", @@ -1138,7 +1138,7 @@ $.fn.tiki = function(func, type, options) { } opts = { showOn: "both", - buttonImage: "pics/icons/calendar.png", + buttonImage: "img/icons/calendar.png", buttonImageOnly: true, dateFormat: "yy-mm-dd", showButtonPanel: true, @@ -1164,7 +1164,7 @@ $.fn.tiki = function(func, type, options) { default: opts = { showOn: "both", - buttonImage: "pics/icons/calendar.png", + buttonImage: "img/icons/calendar.png", buttonImageOnly: true, dateFormat: "yy-mm-dd", showButtonPanel: true @@ -1587,7 +1587,7 @@ function dialogTableOpen(area_id, dialog) { $(dialog).append(el); } if (r == 1) { - el = $("<img src=\"pics/icons/add.png\" />"); + el = $("<img src=\"img/icons/add.png\" />"); $(dialog).append(el); el.click(function() { $(dialog).attr("cols", $(dialog).attr("cols") + 1); @@ -1601,7 +1601,7 @@ function dialogTableOpen(area_id, dialog) { } $(dialog).append($("<br />")); } - el = $("<img src=\"pics/icons/add.png\" />"); + el = $("<img src=\"img/icons/add.png\" />"); $(dialog).append(el); el.click(function() { $(dialog).attr("rows", $(dialog).attr("rows") + 1); @@ -2486,7 +2486,7 @@ function dialogReplaceReplace( area_id ) { $(this).empty(); $(this).append(tr('Favorite')); - $(this).prepend($('<img/>').attr('src', isFavorite() ? 'pics/icons/star.png' : 'pics/icons/star_grey.png')); + $(this).prepend($('<img/>').attr('src', isFavorite() ? 'img/icons/star.png' : 'img/icons/star_grey.png')); // Toggle class of closest surrounding div for css customization if (isFavorite()) { $(this).closest('div').addClass( 'favorite_selected' ); diff --git a/lib/jquery_tiki/tiki-trackers.js b/lib/jquery_tiki/tiki-trackers.js index a2fdc87e973..c5543451260 100644 --- a/lib/jquery_tiki/tiki-trackers.js +++ b/lib/jquery_tiki/tiki-trackers.js @@ -140,7 +140,7 @@ addCheckbox('isPublic'); addCheckbox('isMandatory'); - $row.append($('<td class="action"/>').append($('<a href="#"><img src="pics/icons/cross.png"/></a>') + $row.append($('<td class="action"/>').append($('<a href="#"><img src="img/icons/cross.png"/></a>') .attr('href', $.service('tracker', 'remove_fields', {trackerId: trackerId, 'fields~0': field.fieldId})) .requireConfirm({ message: tr('Removing the field will result in data loss. Are you sure?'), diff --git a/lib/modules/tiki-admin_modules.js b/lib/modules/tiki-admin_modules.js index a748fdf697f..20e62343813 100644 --- a/lib/modules/tiki-admin_modules.js +++ b/lib/modules/tiki-admin_modules.js @@ -84,11 +84,11 @@ $(".modules").sortable( { } }); $("span.moduleflip").each( function() { - var $edit = $('<a title="' + tr("Edit module") + '" href="#"><img src="pics/icons/page_gear.png" alt="[edit]" width="16" height="16" style="position:absolute;right:18px;opacity:0.75;"></a>') + var $edit = $('<a title="' + tr("Edit module") + '" href="#"><img src="img/icons/page_gear.png" alt="[edit]" width="16" height="16" style="position:absolute;right:18px;opacity:0.75;"></a>') .click( function() { $(this).parents(".module:first").dblclick(); }); - var $unassign = $('<a title="' + tr("Unassign module") + '" href="#"><img src="pics/icons/cross.png" alt="[unassign]" width="16" height="16" style="position:absolute;right:36px;opacity:0.75;"></a>') + var $unassign = $('<a title="' + tr("Unassign module") + '" href="#"><img src="img/icons/cross.png" alt="[unassign]" width="16" height="16" style="position:absolute;right:36px;opacity:0.75;"></a>') .click( function() { var id = $(this).parents(".module:first").attr("id").match(/\d+$/); if (id) { diff --git a/lib/parser/parserlib.php b/lib/parser/parserlib.php index b61321b85e9..a96770e6671 100644 --- a/lib/parser/parserlib.php +++ b/lib/parser/parserlib.php @@ -414,7 +414,7 @@ class ParserLib extends TikiDb_Bridge } if ($options['ck_editor']) { - $ret = $this->convert_plugin_for_ckeditor($plugin_name, $arguments, tra('Plugin execution pending approval'), $plugin_data, array('icon' => 'pics/icons/error.png')); + $ret = $this->convert_plugin_for_ckeditor($plugin_name, $arguments, tra('Plugin execution pending approval'), $plugin_data, array('icon' => 'img/icons/error.png')); } else { $smarty->assign('plugin_name', $plugin_name); $smarty->assign('plugin_index', $current_index); @@ -1031,7 +1031,7 @@ if ( \$('#$id') ) { } } $arg_str = rtrim($arg_str, '&'); - $icon = isset($info['icon']) ? $info['icon'] : 'pics/icons/wiki_plugin_edit.png'; + $icon = isset($info['icon']) ? $info['icon'] : 'img/icons/wiki_plugin_edit.png'; // some plugins are just too flakey to do wysiwyg, so show the "source" for them ;( if (in_array($name, array('trackerlist', 'kaltura', 'toc', 'freetagged', 'draw'))) { diff --git a/lib/registration/register_ajax.js b/lib/registration/register_ajax.js index 45780e965f0..99fd65ed384 100644 --- a/lib/registration/register_ajax.js +++ b/lib/registration/register_ajax.js @@ -12,9 +12,9 @@ function check_pass() { // if ((pass1 === '') || (pass2 === '')) { // xajax.$('checkpass').innerHTML = ''; // } else if (pass1 !== pass2) { -// xajax.$('checkpass').innerHTML = "<img src='pics/icons/exclamation.png' style='vertical-align:middle' alt='" + tr('Do not match') + "' /> " + tr("Passwords don't match"); +// xajax.$('checkpass').innerHTML = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='" + tr('Do not match') + "' /> " + tr("Passwords don't match"); // } else if (pass1 === pass2) { -// xajax.$('checkpass').innerHTML = "<img src='pics/icons/accept.png' style='vertical-align:middle' alt='" + tr('Match') + "' /> " + tr("Passwords match"); +// xajax.$('checkpass').innerHTML = "<img src='img/icons/accept.png' style='vertical-align:middle' alt='" + tr('Match') + "' /> " + tr("Passwords match"); // } } diff --git a/lib/setup/wiki.php b/lib/setup/wiki.php index 1fdeeb66727..820e32eed77 100644 --- a/lib/setup/wiki.php +++ b/lib/setup/wiki.php @@ -120,14 +120,14 @@ if (strstr($_SERVER['SCRIPT_NAME'], 'tiki-index.php') || strstr($_SERVER['SCRIPT $homePageContent .= '!' . tr('Congratulations') . "\n"; $homePageContent .= tr('This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.') . "\n\n"; $homePageContent .= tr('You can change this page after logging in. Please review the [http://doc.tiki.org/wiki+syntax|wiki syntax] for editing details.') . "\n\n\n"; - $homePageContent .= '!!'. tr('{img src=pics/icons/star.png alt=\"Star\"} Get started.') . "\n"; + $homePageContent .= '!!'. tr('{img src=img/icons/star.png alt=\"Star\"} Get started.') . "\n"; $homePageContent .= tr('To begin configuring your site:') . "\n"; $homePageContent .= "{FANCYLIST()}\n"; $homePageContent .= tr('1) Log in with your newly created password.') . "\n"; $homePageContent .= tr('2) Manually Enable specific Tiki features.') . "\n"; $homePageContent .= tr('3) Run Tiki Profiles to quickly get up and running.') . "\n"; $homePageContent .= "{FANCYLIST}\n\n"; - $homePageContent .= '!!' . tr('{img src=pics/icons/help.png alt=\"Help\"} Need help?') . "\n"; + $homePageContent .= '!!' . tr('{img src=img/icons/help.png alt=\"Help\"} Need help?') . "\n"; $homePageContent .= tr('For more information:') . "\n"; $homePageContent .= '*' . tr('[http://info.tiki.org/Learn+More|Learn more about Tiki].') . "\n"; $homePageContent .= '*' . tr('[http://info.tiki.org/Help+Others|Get help], including the [http://doc.tiki.org|official documentation] and [http://tiki.org/forums|support forums].') . "\n"; diff --git a/lib/smarty_tiki/function.icon.php b/lib/smarty_tiki/function.icon.php index 228a4c16c51..5d20172443e 100644 --- a/lib/smarty_tiki/function.icon.php +++ b/lib/smarty_tiki/function.icon.php @@ -15,7 +15,7 @@ if (strpos($_SERVER["SCRIPT_NAME"], basename(__FILE__)) !== false) { * smarty_function_icon: Display a Tiki icon, using theme icons if they exists * * params will be used as params for the HTML tag (e.g. border, class, ...), except special params starting with '_' : - * - _id: short name (i.e. 'page_edit') or relative file path (i.e. 'pics/icons/page_edit.png'). [required] + * - _id: short name (i.e. 'page_edit') or relative file path (i.e. 'img/icons/page_edit.png'). [required] * - _type: type of URL to use (e.g. 'absolute_uri', 'absolute_path'). Defaults to a relative URL. * - _tag: type of HTML tag to use (e.g. 'img', 'input_image'). Defaults to 'img' tag. * - _notag: if set to 'y', will only return the URL (which also handles theme icons). @@ -55,7 +55,7 @@ function smarty_function_icon($params, $smarty) return $cached; } - $basedirs = array('pics/icons', 'images', 'img/icons', 'img/icons/mime'); + $basedirs = array('img/icons', 'img/icons/mime'); $icons_extension = empty($params['_extension']) ? '.png' : '.' . $params['_extension']; $tag = 'img'; $notag = false; diff --git a/lib/smarty_tiki/function.listfilter.php b/lib/smarty_tiki/function.listfilter.php index 2c5a700f014..39278089e82 100644 --- a/lib/smarty_tiki/function.listfilter.php +++ b/lib/smarty_tiki/function.listfilter.php @@ -77,7 +77,7 @@ function smarty_function_listfilter($params, $smarty) } $input .= " class='listfilter' />"; - $input .= "<img src='pics/icons/close.png' onclick=\"\$('#$id').val('').keyup();return false;\" class='closeicon' width='16' height='16' style='visibility:hidden;position:relative;right:20px;top:6px;'/>"; + $input .= "<img src='img/icons/close.png' onclick=\"\$('#$id').val('').keyup();return false;\" class='closeicon' width='16' height='16' style='visibility:hidden;position:relative;right:20px;top:6px;'/>"; $input .= "</label>"; if (!isset($selectors)) $selectors = ".$id table tr"; diff --git a/lib/tiki-js-sorttable.js b/lib/tiki-js-sorttable.js index d6a220d269f..cc6fd13149e 100644 --- a/lib/tiki-js-sorttable.js +++ b/lib/tiki-js-sorttable.js @@ -84,11 +84,11 @@ function ts_resortTable(lnk) { newRows.sort(sortfn); if (span.getAttribute("sortdir") == 'down') { - ARROW = ' <img src="pics/icons/resultset_up.png" width="16" height="16" />'; + ARROW = ' <img src="img/icons/resultset_up.png" width="16" height="16" />'; newRows.reverse(); span.setAttribute('sortdir','up'); } else { - ARROW = ' <img src="pics/icons/resultset_down.png" width="16" height="16" />'; + ARROW = ' <img src="img/icons/resultset_down.png" width="16" height="16" />'; span.setAttribute('sortdir','down'); } diff --git a/lib/tiki-js.js b/lib/tiki-js.js index 19ac46f3894..8d6548f978d 100644 --- a/lib/tiki-js.js +++ b/lib/tiki-js.js @@ -1194,7 +1194,7 @@ function popup_plugin_form(area_id, type, index, pageName, pluginArgs, bodyConte minimize.appendChild( icon ); minimize.href = 'javascript:void(0)'; container.appendChild( minimize ); - icon.src = 'pics/icons/cross.png'; + icon.src = 'img/icons/cross.png'; icon.style.position = 'absolute'; icon.style.top = '5px'; icon.style.right = '5px'; @@ -1315,7 +1315,7 @@ function build_plugin_form( type, index, pageName, pluginArgs, bodyContent ) desc.innerHTML = meta.description; if (meta.documentation) { desc.innerHTML += ' <a href="http://doc.tiki.org/' + meta.documentation + '" target="tikihelp" class="tikihelp" tabIndex="-1">' + - '<img src="pics/icons/help.png" alt="Help" width="16" height="16" class="icon" title="Help" class="icon">' + + '<img src="img/icons/help.png" alt="Help" width="16" height="16" class="icon" title="Help" class="icon">' + '</a>'; } @@ -1461,7 +1461,7 @@ function build_plugin_form_row(row, name, label_name, requiredOrSpecial, value, field.appendChild( input ); if (paramDef && paramDef.type == 'image') { icon = document.createElement( 'img' ); - icon.src = 'pics/icons/image.png'; + icon.src = 'img/icons/image.png'; input.id = paramDef.area ? paramDef.area : 'fgal_picker'; icon.onclick = function() {openFgalsWindowArea(paramDef.area ? paramDef.area :'fgal_picker');}; field.appendChild( icon ); @@ -1640,28 +1640,28 @@ function runPassword(strPassword, strFieldID) // -- Very Secure if (nScore >= 90) { - var strIcon = "<img src='pics/icons/accept.png' style='vertical-align:middle' alt='Very Secure' />"; + var strIcon = "<img src='img/icons/accept.png' style='vertical-align:middle' alt='Very Secure' />"; var strText = tr("Very Secure"); var strColor = "#0ca908"; } // -- Secure else if (nScore >= 80) { - strIcon = "<img src='pics/icons/accept.png' style='vertical-align:middle' alt='Secure' />"; + strIcon = "<img src='img/icons/accept.png' style='vertical-align:middle' alt='Secure' />"; strText = tr("Secure"); strColor = "#0ca908"; } // -- Very Strong else if (nScore >= 70) { - strIcon = "<img src='pics/icons/accept.png' style='vertical-align:middle' alt='Very Strong' />"; + strIcon = "<img src='img/icons/accept.png' style='vertical-align:middle' alt='Very Strong' />"; strText = tr("Very Strong"); strColor = "#0ca908"; } // -- Strong else if (nScore >= 60) { - strIcon = "<img src='pics/icons/accept.png' style='vertical-align:middle' alt='Strong' />"; + strIcon = "<img src='img/icons/accept.png' style='vertical-align:middle' alt='Strong' />"; strText = tr("Strong"); strColor = "#0ca908"; } @@ -1675,14 +1675,14 @@ function runPassword(strPassword, strFieldID) // -- Weak else if (nScore >= 25) { - strIcon = "<img src='pics/icons/exclamation.png' style='vertical-align:middle' alt='Weak' />"; + strIcon = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='Weak' />"; strText = tr("Weak"); strColor = "#ff0000"; } // -- Very Weak else { - strIcon = "<img src='pics/icons/exclamation.png' style='vertical-align:middle' alt='Very weak' />"; + strIcon = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='Very weak' />"; strText = tr("Very Weak"); strColor = "#ff0000"; } @@ -1709,7 +1709,7 @@ function countContain(strPassword, strCheck) function checkPasswordsMatch(in1, in2, el) { if ($(in1).val().length && $(in1).val() == $(in2).val()) { - $(el).html("<img src='pics/icons/accept.png' style='vertical-align:middle' alt='Secure' /><em>" + tr("Passwords match") + "</em>"); + $(el).html("<img src='img/icons/accept.png' style='vertical-align:middle' alt='Secure' /><em>" + tr("Passwords match") + "</em>"); return true; } else { $(el).html(""); @@ -1886,9 +1886,9 @@ function adjustRating(element, data) { for (var i=0; i < $sibs.length; i++) { if (i < data[0].voteavg) { - $("img", $sibs[i]).attr("src", "pics/icons/star.png"); + $("img", $sibs[i]).attr("src", "img/icons/star.png"); } else { - $("img", $sibs[i]).attr("src", "pics/icons/star_grey.png"); + $("img", $sibs[i]).attr("src", "img/icons/star_grey.png"); } } $(element).parent().next().text("(" + data[0].numvotes + ")") diff --git a/lib/tikihelplib.php b/lib/tikihelplib.php index 9402c8e94ec..5e8750b5e6f 100644 --- a/lib/tikihelplib.php +++ b/lib/tikihelplib.php @@ -43,7 +43,7 @@ function help_doclink($params) { if (!isset($desc)) $desc = tra('Help link'); $ret = '<a title="'.htmlentities($desc,ENT_COMPAT,"UTF-8").'" href="' .$prefs['helpurl'].$url.'" target="tikihelp" class="tikihelp">' - .'<img src="pics/icons/help.png"' + .'<img src="img/icons/help.png"' .' height="16" width="16" alt="'.tra('Help','',true).'" /></a>'; } return $ret; diff --git a/lib/toolbars/tiki-admin_toolbars.js b/lib/toolbars/tiki-admin_toolbars.js index 386f45ee03f..8c4757281b0 100644 --- a/lib/toolbars/tiki-admin_toolbars.js +++ b/lib/toolbars/tiki-admin_toolbars.js @@ -101,7 +101,7 @@ $(document).ready(function () { if (item) { $('#toolbar_edit_div #tool_name').val($(item).text()); //.attr('disabled','disabled'); $('#toolbar_edit_div #tool_label').val($(item).children('img').attr('title')); - if ($(item).children('img').attr('src') !== 'pics/icons/shading.png') { + if ($(item).children('img').attr('src') !== 'img/icons/shading.png') { $('#toolbar_edit_div #tool_icon').val($(item).children('img').attr('src')); } else { $('#toolbar_edit_div #tool_icon').val(''); diff --git a/lib/toolbars/toolbarslib.php b/lib/toolbars/toolbarslib.php index a4cc6ca4563..627d73ced89 100644 --- a/lib/toolbars/toolbarslib.php +++ b/lib/toolbars/toolbarslib.php @@ -194,7 +194,7 @@ abstract class Toolbar return isset($prefs["toolbar_tool_$name"]); } - public static function saveTool($name, $label, $icon = 'pics/icons/shading.png', $token = '', $syntax = '', $type = 'Inline', $plugin = '') + public static function saveTool($name, $label, $icon = 'img/icons/shading.png', $token = '', $syntax = '', $type = 'Inline', $plugin = '') { global $tikilib; @@ -309,7 +309,7 @@ abstract class Toolbar $tag->setLabel($data['label']) ->setWysiwygToken($data['token']) - ->setIcon(!empty($data['icon']) ? $data['icon'] : 'pics/icons/shading.png') + ->setIcon(!empty($data['icon']) ? $data['icon'] : 'img/icons/shading.png') ->setType($data['type']); return $tag; @@ -414,7 +414,7 @@ abstract class Toolbar $content = $title; $params['_icon'] = $this->icon; - if (strpos($class, 'qt-plugin') !== false && $this->icon == 'pics/icons/plugin.png') { + if (strpos($class, 'qt-plugin') !== false && $this->icon == 'img/icons/plugin.png') { $params['_menu_text'] = 'y'; $params['_menu_icon'] = 'y'; } @@ -479,7 +479,7 @@ class ToolbarCkOnly extends Toolbar if (is_file($img_path)) { $icon = $img_path; } else { - $icon = 'pics/icons/shading.png'; + $icon = 'img/icons/shading.png'; } } $this->setWysiwygToken($token) @@ -599,7 +599,7 @@ class ToolbarCkOnly extends Toolbar { global $headerlib; - if ((!empty($this->icon) && $this->icon !== 'pics/icons/shading.png') || in_array($this->label, array('Autosave'))) { + if ((!empty($this->icon) && $this->icon !== 'img/icons/shading.png') || in_array($this->label, array('Autosave'))) { return parent::getIconHtml(); } @@ -626,31 +626,31 @@ class ToolbarInline extends Toolbar switch( $tagName ) { case 'bold': $label = tra('Bold'); - $icon = tra('pics/icons/text_bold.png'); + $icon = tra('img/icons/text_bold.png'); $wysiwyg = 'Bold'; $syntax = '__text__'; break; case 'italic': $label = tra('Italic'); - $icon = tra('pics/icons/text_italic.png'); + $icon = tra('img/icons/text_italic.png'); $wysiwyg = 'Italic'; $syntax = "''text''"; break; case 'underline': $label = tra('Underline'); - $icon = tra('pics/icons/text_underline.png'); + $icon = tra('img/icons/text_underline.png'); $wysiwyg = 'Underline'; $syntax = "===text==="; break; case 'strike': $label = tra('Strikethrough'); - $icon = tra('pics/icons/text_strikethrough.png'); + $icon = tra('img/icons/text_strikethrough.png'); $wysiwyg = 'Strike'; $syntax = '--text--'; break; case 'nonparsed': $label = tra('Non-parsed (Wiki syntax does not apply)'); - $icon = tra('pics/icons/noparse.png'); + $icon = tra('img/icons/noparse.png'); $wysiwyg = null; $syntax = '~np~text~/np~'; break; @@ -661,7 +661,7 @@ class ToolbarInline extends Toolbar $tag = new self; $tag->setLabel($label) ->setWysiwygToken($wysiwyg) - ->setIcon(!empty($icon) ? $icon : 'pics/icons/shading.png') + ->setIcon(!empty($icon) ? $icon : 'img/icons/shading.png') ->setSyntax($syntax) ->setType('Inline'); @@ -715,7 +715,7 @@ class ToolbarBlock extends ToolbarInline // Will change in the future switch( $tagName ) { case 'center': $label = tra('Align Center'); - $icon = tra('pics/icons/text_align_center.png'); + $icon = tra('img/icons/text_align_center.png'); $wysiwyg = 'JustifyCenter'; if ($prefs['feature_use_three_colon_centertag'] == 'y') { $syntax = ":::text:::"; @@ -725,25 +725,25 @@ class ToolbarBlock extends ToolbarInline // Will change in the future break; case 'rule': $label = tra('Horizontal Bar'); - $icon = tra('pics/icons/page.png'); + $icon = tra('img/icons/page.png'); $wysiwyg = 'HorizontalRule'; $syntax = '---'; break; case 'pagebreak': $label = tra('Page Break'); - $icon = tra('pics/icons/page_break.png'); + $icon = tra('img/icons/page_break.png'); $wysiwyg = 'PageBreak'; $syntax = '...page...'; break; case 'box': $label = tra('Box'); - $icon = tra('pics/icons/box.png'); + $icon = tra('img/icons/box.png'); $wysiwyg = 'Box'; $syntax = '^text^'; break; case 'email': $label = tra('Email'); - $icon = tra('pics/icons/email.png'); + $icon = tra('img/icons/email.png'); $wysiwyg = null; $syntax = '[mailto:email@example.com|text]'; break; @@ -751,19 +751,19 @@ class ToolbarBlock extends ToolbarInline // Will change in the future case 'h2': case 'h3': $label = tra('Heading') . ' ' . $tagName{1}; - $icon = 'pics/icons/text_heading_' . $tagName{1} . '.png'; + $icon = 'img/icons/text_heading_' . $tagName{1} . '.png'; $wysiwyg = null; $syntax = str_repeat('!', $tagName{1}) . 'text'; break; case 'titlebar': $label = tra('Title bar'); - $icon = 'pics/icons/text_padding_top.png'; + $icon = 'img/icons/text_padding_top.png'; $wysiwyg = null; $syntax = '-=text=-'; break; case 'toc': $label = tra('Table of contents'); - $icon = tra('pics/icons/book.png'); + $icon = tra('img/icons/book.png'); $wysiwyg = 'TOC'; $syntax = '{maketoc}'; break; @@ -774,7 +774,7 @@ class ToolbarBlock extends ToolbarInline // Will change in the future $tag = new self; $tag->setLabel($label) ->setWysiwygToken($wysiwyg) - ->setIcon(!empty($icon) ? $icon : 'pics/icons/shading.png') + ->setIcon(!empty($icon) ? $icon : 'img/icons/shading.png') ->setSyntax($syntax) ->setType('Block'); @@ -808,13 +808,13 @@ class ToolbarLineBased extends ToolbarInline // Will change in the future switch( $tagName ) { case 'list': $label = tra('Unordered List'); - $icon = tra('pics/icons/text_list_bullets.png'); + $icon = tra('img/icons/text_list_bullets.png'); $wysiwyg = 'BulletedList'; $syntax = '*text'; break; case 'numlist': $label = tra('Ordered List'); - $icon = tra('pics/icons/text_list_numbers.png'); + $icon = tra('img/icons/text_list_numbers.png'); $wysiwyg = 'NumberedList'; $syntax = '#text'; break; @@ -825,7 +825,7 @@ class ToolbarLineBased extends ToolbarInline // Will change in the future $tag = new self; $tag->setLabel($label) ->setWysiwygToken($wysiwyg) - ->setIcon(!empty($icon) ? $icon : 'pics/icons/shading.png') + ->setIcon(!empty($icon) ? $icon : 'img/icons/shading.png') ->setSyntax($syntax) ->setType('LineBased'); @@ -880,7 +880,7 @@ class ToolbarPicker extends Toolbar case 'color': $wysiwyg = 'TextColor'; $label = tra('Foreground color'); - $icon = tra('pics/icons/palette.png'); + $icon = tra('img/icons/palette.png'); $rawList = array(); $styleType = 'color'; @@ -909,7 +909,7 @@ class ToolbarPicker extends Toolbar case 'bgcolor': $label = tra('Background Color'); - $icon = tra('pics/icons/palette_bg.png'); + $icon = tra('img/icons/palette_bg.png'); $wysiwyg = 'BGColor'; $styleType = 'background-color'; $rawList = array(); @@ -943,7 +943,7 @@ class ToolbarPicker extends Toolbar $tag = new self; $tag->setWysiwygToken($wysiwyg) ->setLabel($label) - ->setIcon(!empty($icon) ? $icon : 'pics/icons/shading.png') + ->setIcon(!empty($icon) ? $icon : 'img/icons/shading.png') ->setList($list) ->setType('Picker') ->setName($tagName) @@ -1053,7 +1053,7 @@ class ToolbarDialog extends Toolbar switch( $tagName ) { case 'tikilink': $label = tra('Wiki Link'); - $icon = tra('pics/icons/page_link.png'); + $icon = tra('img/icons/page_link.png'); $wysiwyg = ''; // cke link dialog now adapted for wiki links $list = array('Wiki Link', '<label for="tbWLinkDesc">Show this text</label>', @@ -1073,7 +1073,7 @@ class ToolbarDialog extends Toolbar case 'link': $wysiwyg = 'Link'; $label = tra('External Link'); - $icon = tra('pics/icons/world_link.png'); + $icon = tra('img/icons/world_link.png'); $list = array('External Link', '<label for="tbLinkDesc">Show this text</label>', '<input type="text" id="tbLinkDesc" class="ui-widget-content ui-corner-all" style="width: 98%" />', @@ -1090,7 +1090,7 @@ class ToolbarDialog extends Toolbar break; case 'table': - $icon = tra('pics/icons/table.png'); + $icon = tra('img/icons/table.png'); $wysiwyg = 'Table'; $label = tra('Table Builder'); $list = array('Table Builder', @@ -1101,7 +1101,7 @@ class ToolbarDialog extends Toolbar break; case 'find': - $icon = tra('pics/icons/find.png'); + $icon = tra('img/icons/find.png'); $wysiwyg = 'Find'; $label = tra('Find Text'); $list = array('Find Text', @@ -1118,7 +1118,7 @@ class ToolbarDialog extends Toolbar break; case 'replace': - $icon = tra('pics/icons/text_replace.png'); + $icon = tra('img/icons/text_replace.png'); $wysiwyg = 'Replace'; $label = tra('Text Replace'); $tool_prefs[] = 'feature_wiki_replace'; @@ -1148,7 +1148,7 @@ class ToolbarDialog extends Toolbar $tag->name = $tagName; $tag->setWysiwygToken($wysiwyg) ->setLabel($label) - ->setIcon(!empty($icon) ? $icon : 'pics/icons/shading.png') + ->setIcon(!empty($icon) ? $icon : 'img/icons/shading.png') ->setList($list) ->setType('Dialog'); @@ -1250,7 +1250,7 @@ class ToolbarFullscreen extends Toolbar function __construct() // {{{ { $this->setLabel(tra('Full Screen Edit')) - ->setIcon('pics/icons/application_get.png') + ->setIcon('img/icons/application_get.png') ->setWysiwygToken('Maximize') ->setType('Fullscreen'); } // }}} @@ -1277,7 +1277,7 @@ class ToolbarHelptool extends Toolbar function __construct() // {{{ { $this->setLabel(tra('Wiki Help')) - ->setIcon('pics/icons/help.png') + ->setIcon('img/icons/help.png') ->setType('Helptool'); } // }}} @@ -1357,7 +1357,7 @@ class ToolbarFileGallery extends Toolbar function __construct() // {{{ { $this->setLabel(tra('Choose or upload images')) - ->setIcon(tra('pics/icons/pictures.png')) + ->setIcon(tra('img/icons/pictures.png')) ->setWysiwygToken('tikiimage') ->setType('FileGallery') ->addRequiredPreference('feature_filegals_manager'); @@ -1398,7 +1398,7 @@ class ToolbarFileGalleryFile extends ToolbarFileGallery function __construct() // {{{ { $this->setLabel(tra('Choose or upload files')) - ->setIcon(tra('pics/icons/file-manager-add.png')) + ->setIcon(tra('img/icons/file-manager-add.png')) ->setWysiwygToken('tikifile') ->setType('FileGallery') ->addRequiredPreference('feature_filegals_manager'); @@ -1419,7 +1419,7 @@ class ToolbarSwitchEditor extends Toolbar function __construct() // {{{ { $this->setLabel(tra('Switch Editor (wiki or WYSIWYG)')) - ->setIcon(tra('pics/icons/pencil_go.png')) + ->setIcon(tra('img/icons/pencil_go.png')) ->setWysiwygToken('tikiswitch') ->setType('SwitchEditor') ->addRequiredPreference('feature_wysiwyg'); @@ -1513,7 +1513,7 @@ class ToolbarWikiplugin extends Toolbar if (isset($info['icon']) and $info['icon'] != '') { $icon = $info['icon']; } else { - $icon = 'pics/icons/plugin.png'; + $icon = 'img/icons/plugin.png'; } $tag = new self; @@ -1593,7 +1593,7 @@ class ToolbarSheet extends Toolbar switch( $tagName ) { case 'sheetsave': $label = tra('Save Sheet'); - $icon = tra('pics/icons/disk.png'); + $icon = tra('img/icons/disk.png'); $syntax = ' $("#saveState").hide(); $.sheet.saveSheet($.sheet.tikiSheet, function() { @@ -1602,91 +1602,91 @@ class ToolbarSheet extends Toolbar break; case 'addrow': $label = tra('Add Row After Selection Or To End If No Selection'); - $icon = tra('pics/icons/sheet_row_add.png'); + $icon = tra('img/icons/sheet_row_add.png'); $syntax = 'sheetInstance.controlFactory.addRow();'; // add row after end to workaround bug in jquery.sheet.js 1.0.2 break; // TODO fix properly for 5.1 case 'addrowmulti': $label = tra('Add Multiple Rows After Selection Or To End If No Selection'); - $icon = tra('pics/icons/sheet_row_add_multi.png'); + $icon = tra('img/icons/sheet_row_add_multi.png'); $syntax = 'sheetInstance.controlFactory.addRowMulti();'; break; case 'addrowbefore': $label = tra('Add Row Before Selection Or To End If No Selection'); - $icon = tra('pics/icons/sheet_row_add.png'); + $icon = tra('img/icons/sheet_row_add.png'); $syntax = 'sheetInstance.controlFactory.addRow(null, true);'; // add row after end to workaround bug in jquery.sheet.js 1.0.2 break; case 'deleterow': $label = tra('Delete Selected Row'); - $icon = tra('pics/icons/sheet_row_delete.png'); + $icon = tra('img/icons/sheet_row_delete.png'); $syntax = 'sheetInstance.deleteRow();'; break; case 'addcolumn': $label = tra('Add Column After Selection Or To End If No Selection'); - $icon = tra('pics/icons/sheet_col_add.png'); + $icon = tra('img/icons/sheet_col_add.png'); $syntax = 'sheetInstance.controlFactory.addColumn();'; // add col before current or at end if none selected break; case 'deletecolumn': $label = tra('Delete Selected Column'); - $icon = tra('pics/icons/sheet_col_delete.png'); + $icon = tra('img/icons/sheet_col_delete.png'); $syntax = 'sheetInstance.deleteColumn();'; break; case 'addcolumnmulti': $label = tra('Add Multiple Columns After Selection Or To End If No Selection'); - $icon = tra('pics/icons/sheet_col_add_multi.png'); + $icon = tra('img/icons/sheet_col_add_multi.png'); $syntax = 'sheetInstance.controlFactory.addColumnMulti();'; break; case 'addcolumnbefore': $label = tra('Add Column Before Selection Or To End If No Selection'); - $icon = tra('pics/icons/sheet_col_add.png'); + $icon = tra('img/icons/sheet_col_add.png'); $syntax = 'sheetInstance.controlFactory.addColumn(null, true);'; // add col before current or at end if none selected break; case 'sheetgetrange': $label = tra('Get Cell Range'); - $icon = tra('pics/icons/sheet_get_range.png'); + $icon = tra('img/icons/sheet_get_range.png'); $syntax = 'sheetInstance.getTdRange(null, sheetInstance.obj.formula().val()); return false;'; break; case 'sheetfind': $label = tra('Find'); - $icon = tra('pics/icons/find.png'); + $icon = tra('img/icons/find.png'); $syntax = 'sheetInstance.cellFind();'; break; case 'sheetrefresh': $label = tra('Refresh Calculations'); - $icon = tra('pics/icons/arrow_refresh.png'); + $icon = tra('img/icons/arrow_refresh.png'); $syntax = 'sheetInstance.calc();'; break; case 'sheetclose': $label = tra('Finish Editing'); - $icon = tra('pics/icons/close.png'); + $icon = tra('img/icons/close.png'); $syntax = '$.sheet.manageState(sheetInstance.obj.parent(), true);'; // temporary workaround TODO properly break; case 'bold': $label = tra('Bold'); - $icon = tra('pics/icons/text_bold.png'); + $icon = tra('img/icons/text_bold.png'); $wysiwyg = 'Bold'; $syntax = 'sheetInstance.cellStyleToggle("styleBold");'; break; case 'italic': $label = tra('Italic'); - $icon = tra('pics/icons/text_italic.png'); + $icon = tra('img/icons/text_italic.png'); $wysiwyg = 'Italic'; $syntax = 'sheetInstance.cellStyleToggle("styleItalics");'; break; case 'underline': $label = tra('Underline'); - $icon = tra('pics/icons/text_underline.png'); + $icon = tra('img/icons/text_underline.png'); $wysiwyg = 'Underline'; $syntax = 'sheetInstance.cellStyleToggle("styleUnderline");'; break; case 'strike': $label = tra('Strikethrough'); - $icon = tra('pics/icons/text_strikethrough.png'); + $icon = tra('img/icons/text_strikethrough.png'); $wysiwyg = 'Strike'; $syntax = 'sheetInstance.cellStyleToggle("styleLineThrough");'; break; case 'center': $label = tra('Align Center'); - $icon = tra('pics/icons/text_align_center.png'); + $icon = tra('img/icons/text_align_center.png'); $syntax = 'sheetInstance.cellStyleToggle("styleCenter");'; break; default: @@ -1695,7 +1695,7 @@ class ToolbarSheet extends Toolbar $tag = new self; $tag->setLabel($label) - ->setIcon(!empty($icon) ? $icon : 'pics/icons/shading.png') + ->setIcon(!empty($icon) ? $icon : 'img/icons/shading.png') ->setSyntax($syntax) ->setType('Sheet'); diff --git a/lib/wiki-plugins/wikiplugin_addtocart.php b/lib/wiki-plugins/wikiplugin_addtocart.php index 6fff62a7b68..d0cfd26455e 100644 --- a/lib/wiki-plugins/wikiplugin_addtocart.php +++ b/lib/wiki-plugins/wikiplugin_addtocart.php @@ -14,7 +14,7 @@ function wikiplugin_addtocart_info() 'prefs' => array( 'wikiplugin_addtocart', 'payment_feature' ), 'filter' => 'wikicontent', 'format' => 'html', - 'icon' => 'pics/icons/cart_add.png', + 'icon' => 'img/icons/cart_add.png', 'tags' => array( 'basic' ), 'params' => array( 'code' => array( diff --git a/lib/wiki-plugins/wikiplugin_addtogooglecal.php b/lib/wiki-plugins/wikiplugin_addtogooglecal.php index 7f30862aaf0..cc2ebf6050a 100644 --- a/lib/wiki-plugins/wikiplugin_addtogooglecal.php +++ b/lib/wiki-plugins/wikiplugin_addtogooglecal.php @@ -13,7 +13,7 @@ function wikiplugin_addtogooglecal_info() 'description' => tra('Add a calendar item to a Google calendar'), 'prefs' => array('wikiplugin_addtogooglecal'), 'introduced' => 6, - 'icon' => 'pics/icons/calendar_add.png', + 'icon' => 'img/icons/calendar_add.png', 'format' => 'html', 'params' => array( 'calitemid' => array( diff --git a/lib/wiki-plugins/wikiplugin_agentinfo.php b/lib/wiki-plugins/wikiplugin_agentinfo.php index 661a5397cb3..8980b6fb516 100644 --- a/lib/wiki-plugins/wikiplugin_agentinfo.php +++ b/lib/wiki-plugins/wikiplugin_agentinfo.php @@ -12,7 +12,7 @@ function wikiplugin_agentinfo_info() 'documentation' => 'PluginAgentinfo', 'description' => tra('Show user\'s browser and server information'), 'prefs' => array('wikiplugin_agentinfo'), - 'icon' => 'pics/icons/computer.png', + 'icon' => 'img/icons/computer.png', 'params' => array( 'info' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_alink.php b/lib/wiki-plugins/wikiplugin_alink.php index 1126770a0eb..91e2b22d259 100644 --- a/lib/wiki-plugins/wikiplugin_alink.php +++ b/lib/wiki-plugins/wikiplugin_alink.php @@ -13,7 +13,7 @@ function wikiplugin_alink_info() 'description' => tra('Create a link to an anchor'), 'prefs' => array('wikiplugin_alink'), 'body' => tra('Anchor link label.'), - 'icon' => 'pics/icons/world_link.png', + 'icon' => 'img/icons/world_link.png', 'tags' => array( 'basic' ), 'params' => array( 'aname' => array( diff --git a/lib/wiki-plugins/wikiplugin_aname.php b/lib/wiki-plugins/wikiplugin_aname.php index 457180c5f89..e22d7ecd54c 100644 --- a/lib/wiki-plugins/wikiplugin_aname.php +++ b/lib/wiki-plugins/wikiplugin_aname.php @@ -15,7 +15,7 @@ function wikiplugin_aname_info() 'body' => tra('The name of the anchor.'), 'tags' => array( 'basic' ), 'params' => array(), - 'icon' => 'pics/icons/anchor.png', + 'icon' => 'img/icons/anchor.png', ); } diff --git a/lib/wiki-plugins/wikiplugin_annotation.php b/lib/wiki-plugins/wikiplugin_annotation.php index 589edc57e8b..49b3e1c833f 100644 --- a/lib/wiki-plugins/wikiplugin_annotation.php +++ b/lib/wiki-plugins/wikiplugin_annotation.php @@ -14,7 +14,7 @@ function wikiplugin_annotation_info() 'prefs' => array('wikiplugin_annotation'), 'body' => tra('Autogenerated content. Leave blank initially.'), 'filter' => 'striptags', - 'icon' => 'pics/icons/image_edit.png', + 'icon' => 'img/icons/image_edit.png', 'tags' => array( 'basic' ), 'params' => array( 'src' => array( diff --git a/lib/wiki-plugins/wikiplugin_article.php b/lib/wiki-plugins/wikiplugin_article.php index de3a2008d32..24a3283054a 100644 --- a/lib/wiki-plugins/wikiplugin_article.php +++ b/lib/wiki-plugins/wikiplugin_article.php @@ -12,7 +12,7 @@ function wikiplugin_article_info() 'documentation' => 'PluginArticle', 'description' => tra('Display a field of an article'), 'prefs' => array( 'feature_articles', 'wikiplugin_article' ), - 'icon' => 'pics/icons/layout_content.png', + 'icon' => 'img/icons/layout_content.png', 'format' => 'html', 'params' => array( 'Field' => array( @@ -50,7 +50,7 @@ function wikiplugin_article($data, $params) } if ($tiki_p_admin_cms == 'y' || $tikilib->user_has_perm_on_object($user, $Id, 'article', 'tiki_p_edit_article') || (isset($article_data) && $article_data["author"] == $user && $article_data["creator_edit"] == 'y')) { - $add=" <a href='tiki-edit_article.php?articleId=$Id' class='editplugin'><img src='pics/icons/page_edit.png' style='border:none' /></a>"; + $add=" <a href='tiki-edit_article.php?articleId=$Id' class='editplugin'><img src='img/icons/page_edit.png' style='border:none' /></a>"; } else { $add=""; } diff --git a/lib/wiki-plugins/wikiplugin_articles.php b/lib/wiki-plugins/wikiplugin_articles.php index 6dca2bdd68d..7c3c20348de 100644 --- a/lib/wiki-plugins/wikiplugin_articles.php +++ b/lib/wiki-plugins/wikiplugin_articles.php @@ -12,7 +12,7 @@ function wikiplugin_articles_info() 'documentation' => 'PluginArticles', 'description' => tra('Display multiple articles'), 'prefs' => array( 'feature_articles', 'wikiplugin_articles' ), - 'icon' => 'pics/icons/table_multiple.png', + 'icon' => 'img/icons/table_multiple.png', 'tags' => array( 'basic' ), 'params' => array( 'usePagination' => array( diff --git a/lib/wiki-plugins/wikiplugin_attach.php b/lib/wiki-plugins/wikiplugin_attach.php index d9abed028d4..8daddd42bf6 100644 --- a/lib/wiki-plugins/wikiplugin_attach.php +++ b/lib/wiki-plugins/wikiplugin_attach.php @@ -13,7 +13,7 @@ function wikiplugin_attach_info() 'description' => tra('Displays an attachment or a list of them'), 'prefs' => array( 'feature_wiki_attachments', 'wikiplugin_attach' ), 'body' => tra("Comment"), - 'icon' => 'pics/icons/attach.png', + 'icon' => 'img/icons/attach.png', 'params' => array( 'name' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_attributes.php b/lib/wiki-plugins/wikiplugin_attributes.php index 17602368749..c356289c6c3 100644 --- a/lib/wiki-plugins/wikiplugin_attributes.php +++ b/lib/wiki-plugins/wikiplugin_attributes.php @@ -14,7 +14,7 @@ function wikiplugin_attributes_info() 'prefs' => array( 'wikiplugin_attributes' ), 'extraparams' => true, 'defaultfilter' => 'text', - 'icon' => 'pics/icons/page_gear.png', + 'icon' => 'img/icons/page_gear.png', 'params' => array( ), ); diff --git a/lib/wiki-plugins/wikiplugin_author.php b/lib/wiki-plugins/wikiplugin_author.php index 85851943dcd..75db6777ad0 100644 --- a/lib/wiki-plugins/wikiplugin_author.php +++ b/lib/wiki-plugins/wikiplugin_author.php @@ -13,7 +13,7 @@ function wikiplugin_author_info() 'description' => tra('View author contributions to a wiki page'), 'prefs' => array('wikiplugin_author'), 'body' => tra('text'), - 'icon' => 'pics/icons/text_signature.png', + 'icon' => 'img/icons/text_signature.png', 'params' => array( 'author' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_avatar.php b/lib/wiki-plugins/wikiplugin_avatar.php index dcae2af41e8..171dbc9d114 100644 --- a/lib/wiki-plugins/wikiplugin_avatar.php +++ b/lib/wiki-plugins/wikiplugin_avatar.php @@ -13,7 +13,7 @@ function wikiplugin_avatar_info() 'description' => tra('Display a user\'s avatar'), 'prefs' => array('wikiplugin_avatar'), 'body' => tra('username'), - 'icon' => 'pics/icons/user.png', + 'icon' => 'img/icons/user.png', 'params' => array( 'page' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_back.php b/lib/wiki-plugins/wikiplugin_back.php index 9a1511d94c6..3735b62c9fd 100644 --- a/lib/wiki-plugins/wikiplugin_back.php +++ b/lib/wiki-plugins/wikiplugin_back.php @@ -12,7 +12,7 @@ function wikiplugin_back_info() 'documentation' => 'PluginBack', 'description' => tra('Displays a link that goes back one page in the browser history'), 'prefs' => array( 'wikiplugin_back' ), - 'icon' => 'pics/icons/arrow_left.png', + 'icon' => 'img/icons/arrow_left.png', 'tags' => array( 'basic' ), 'params' => array(), ); diff --git a/lib/wiki-plugins/wikiplugin_backlinks.php b/lib/wiki-plugins/wikiplugin_backlinks.php index 5739ce2270c..1fe118d68d6 100644 --- a/lib/wiki-plugins/wikiplugin_backlinks.php +++ b/lib/wiki-plugins/wikiplugin_backlinks.php @@ -112,7 +112,7 @@ function wikiplugin_backlinks_info() 'documentation' => 'PluginBacklinks', 'description' => tra('Lists all pages that link to a particular page'), 'prefs' => array( 'feature_wiki', 'wikiplugin_backlinks' ), - 'icon' => 'pics/icons/link.png', + 'icon' => 'img/icons/link.png', 'params' => array( 'page' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_banner.php b/lib/wiki-plugins/wikiplugin_banner.php index 6e687215a6b..7c8ecf74da8 100644 --- a/lib/wiki-plugins/wikiplugin_banner.php +++ b/lib/wiki-plugins/wikiplugin_banner.php @@ -12,7 +12,7 @@ function wikiplugin_banner_info() 'documentation' => 'PluginBanner', 'description' => tra('Add a banner'), 'prefs' => array('wikiplugin_banner'), - 'icon' => 'pics/icons/page_lightning.png', + 'icon' => 'img/icons/page_lightning.png', 'tags' => array( 'basic' ), 'params' => array( 'zone' => array( diff --git a/lib/wiki-plugins/wikiplugin_bigbluebutton.php b/lib/wiki-plugins/wikiplugin_bigbluebutton.php index 8e677cbe8b1..08b2bf9797e 100644 --- a/lib/wiki-plugins/wikiplugin_bigbluebutton.php +++ b/lib/wiki-plugins/wikiplugin_bigbluebutton.php @@ -13,7 +13,7 @@ function wikiplugin_bigbluebutton_info() 'description' => tra('Starts a video/audio/chat/presentation session using BigBlueButton'), 'format' => 'html', 'prefs' => array( 'wikiplugin_bigbluebutton', 'bigbluebutton_feature' ), - 'icon' => 'pics/icons/webcam.png', + 'icon' => 'img/icons/webcam.png', 'tags' => array( 'basic' ), 'params' => array( 'name' => array( diff --git a/lib/wiki-plugins/wikiplugin_bliptv.php b/lib/wiki-plugins/wikiplugin_bliptv.php index f46728d8d8e..005f4cec168 100644 --- a/lib/wiki-plugins/wikiplugin_bliptv.php +++ b/lib/wiki-plugins/wikiplugin_bliptv.php @@ -14,7 +14,7 @@ function wikiplugin_bliptv_info() 'documentation' => 'PluginBlipTV', 'description' => tra('Display a Blip.tv video'), 'prefs' => array( 'wikiplugin_bliptv' ), - 'icon' => 'pics/icons/bliptv.png', + 'icon' => 'img/icons/bliptv.png', 'params' => array( 'url' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_bloglist.php b/lib/wiki-plugins/wikiplugin_bloglist.php index 1303ddcfb78..72787f4cd5a 100644 --- a/lib/wiki-plugins/wikiplugin_bloglist.php +++ b/lib/wiki-plugins/wikiplugin_bloglist.php @@ -12,7 +12,7 @@ function wikiplugin_bloglist_info() 'documentation' => 'PluginBlogList', 'description' => tra('Display posts from a site blog'), 'prefs' => array( 'feature_blogs', 'wikiplugin_bloglist' ), - 'icon' => 'pics/icons/text_list_bullets.png', + 'icon' => 'img/icons/text_list_bullets.png', 'params' => array( 'Id' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_box.php b/lib/wiki-plugins/wikiplugin_box.php index 0cfe128615a..2dbac71bdd9 100644 --- a/lib/wiki-plugins/wikiplugin_box.php +++ b/lib/wiki-plugins/wikiplugin_box.php @@ -13,7 +13,7 @@ function wikiplugin_box_info() 'description' => tra('Creates a formatted box with a title bar'), 'prefs' => array('wikiplugin_box'), 'body' => tra('text'), - 'icon' => 'pics/icons/layout_header.png', + 'icon' => 'img/icons/layout_header.png', 'tags' => array( 'basic' ), 'params' => array( 'title' => array( diff --git a/lib/wiki-plugins/wikiplugin_button.php b/lib/wiki-plugins/wikiplugin_button.php index dd0dd4a17b9..301482c55d0 100644 --- a/lib/wiki-plugins/wikiplugin_button.php +++ b/lib/wiki-plugins/wikiplugin_button.php @@ -14,7 +14,7 @@ function wikiplugin_button_info() 'prefs' => array('wikiplugin_button'), 'validate' => 'none', 'extraparams' => false, - 'icon' => 'pics/icons/control_play_blue.png', + 'icon' => 'img/icons/control_play_blue.png', 'tags' => array( 'basic' ), 'params' => array( 'href' => array( diff --git a/lib/wiki-plugins/wikiplugin_calendar.php b/lib/wiki-plugins/wikiplugin_calendar.php index 2d9eac7bca0..c09645dcb05 100644 --- a/lib/wiki-plugins/wikiplugin_calendar.php +++ b/lib/wiki-plugins/wikiplugin_calendar.php @@ -12,7 +12,7 @@ function wikiplugin_calendar_info() 'documentation' => 'PluginCalendar', 'description' => tra('Display a calendar and its events'), 'prefs' => array( 'feature_calendar', 'wikiplugin_calendar' ), - 'icon' => 'pics/icons/calendar.png', + 'icon' => 'img/icons/calendar.png', 'params' => array( 'calIds' => array( 'name' => tra('Calendar IDs'), diff --git a/lib/wiki-plugins/wikiplugin_carousel.php b/lib/wiki-plugins/wikiplugin_carousel.php index a64f3f338fa..24ccbd2f5f3 100644 --- a/lib/wiki-plugins/wikiplugin_carousel.php +++ b/lib/wiki-plugins/wikiplugin_carousel.php @@ -13,7 +13,7 @@ function wikiplugin_carousel_info() 'description' => tra('Display images in a self-advancing carousel'), 'introduced' => 8.0, 'prefs' => array('wikiplugin_carousel', 'feature_file_galleries', 'feature_jquery_carousel'), - 'icon' => 'pics/icons/wand.png', + 'icon' => 'img/icons/wand.png', 'tags' => array( 'basic' ), 'params' => array( 'fgalId' => array( diff --git a/lib/wiki-plugins/wikiplugin_category.php b/lib/wiki-plugins/wikiplugin_category.php index 8712f768748..53a6e41d95d 100644 --- a/lib/wiki-plugins/wikiplugin_category.php +++ b/lib/wiki-plugins/wikiplugin_category.php @@ -12,7 +12,7 @@ function wikiplugin_category_info() 'documentation' => 'PluginCategory', 'description' => tra('List categories and objects assigned to them'), 'prefs' => array( 'feature_categories', 'wikiplugin_category' ), - 'icon' => 'pics/icons/sitemap_color.png', + 'icon' => 'img/icons/sitemap_color.png', 'params' => array( 'id' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_catorphans.php b/lib/wiki-plugins/wikiplugin_catorphans.php index 936096dde68..4c631a6981a 100644 --- a/lib/wiki-plugins/wikiplugin_catorphans.php +++ b/lib/wiki-plugins/wikiplugin_catorphans.php @@ -12,7 +12,7 @@ function wikiplugin_catorphans_info() 'documentation' => 'PluginCatOrphans', 'description' => tra('List objects that are not categorized'), 'prefs' => array( 'feature_categories', 'wikiplugin_catorphans' ), - 'icon' => 'pics/icons/sitemap_color.png', + 'icon' => 'img/icons/sitemap_color.png', 'params' => array( 'objects' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_catpath.php b/lib/wiki-plugins/wikiplugin_catpath.php index 251d6cc974a..20d60b41398 100644 --- a/lib/wiki-plugins/wikiplugin_catpath.php +++ b/lib/wiki-plugins/wikiplugin_catpath.php @@ -12,7 +12,7 @@ function wikiplugin_catpath_info() 'documentation' => 'PluginCatPath', 'description' => tra('Show the full category path for a wiki page'), 'prefs' => array( 'feature_categories', 'wikiplugin_catpath' ), - 'icon' => 'pics/icons/sitemap_color.png', + 'icon' => 'img/icons/sitemap_color.png', 'params' => array( 'divider' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_cclite.php b/lib/wiki-plugins/wikiplugin_cclite.php index f2bec26c7ab..03e31a1a2ab 100644 --- a/lib/wiki-plugins/wikiplugin_cclite.php +++ b/lib/wiki-plugins/wikiplugin_cclite.php @@ -15,7 +15,7 @@ function wikiplugin_cclite_info() 'description' => tra('General purpose cclite utility plugin'), // 'validate' => '', 'prefs' => array( 'wikiplugin_cclite', 'payment_feature' ), - 'icon' => 'pics/icons/money.png', + 'icon' => 'img/icons/money.png', 'tags' => array( 'experimental' ), 'params' => array( 'mode' => array( diff --git a/lib/wiki-plugins/wikiplugin_center.php b/lib/wiki-plugins/wikiplugin_center.php index b7ac599011f..afcb3c68027 100644 --- a/lib/wiki-plugins/wikiplugin_center.php +++ b/lib/wiki-plugins/wikiplugin_center.php @@ -13,7 +13,7 @@ function wikiplugin_center_info() 'description' => tra('Center text'), 'prefs' => array('wikiplugin_center'), 'body' => tra('text'), - 'icon' => 'pics/icons/text_align_center.png', + 'icon' => 'img/icons/text_align_center.png', 'filter' => 'wikicontent', 'tags' => array( 'basic' ), 'params' => array( diff --git a/lib/wiki-plugins/wikiplugin_chart.php b/lib/wiki-plugins/wikiplugin_chart.php index 25208c9af00..2f5fbb02c08 100644 --- a/lib/wiki-plugins/wikiplugin_chart.php +++ b/lib/wiki-plugins/wikiplugin_chart.php @@ -12,7 +12,7 @@ function wikiplugin_chart_info() 'documentation' => 'PluginChart', 'description' => tra('Display a chart from TikiSheet'), 'prefs' => array( 'feature_sheet', 'wikiplugin_chart' ), - 'icon' => 'pics/icons/chart_curve.png', + 'icon' => 'img/icons/chart_curve.png', 'body' => tra('Chart caption.'), 'params' => array( 'id' => array( diff --git a/lib/wiki-plugins/wikiplugin_code.php b/lib/wiki-plugins/wikiplugin_code.php index 97c89b75595..71874f1a383 100644 --- a/lib/wiki-plugins/wikiplugin_code.php +++ b/lib/wiki-plugins/wikiplugin_code.php @@ -13,7 +13,7 @@ function wikiplugin_code_info() 'description' => tra('Display code syntax with line numbers and color highlights'), 'prefs' => array('wikiplugin_code'), 'body' => tra('Code to be displayed'), - 'icon' => 'pics/icons/page_white_code.png', + 'icon' => 'img/icons/page_white_code.png', 'filter' => 'rawhtml_unsafe', 'tags' => array( 'basic' ), 'params' => array( diff --git a/lib/wiki-plugins/wikiplugin_colorbox.php b/lib/wiki-plugins/wikiplugin_colorbox.php index 7c1b1ea153b..b3aaedb98dd 100644 --- a/lib/wiki-plugins/wikiplugin_colorbox.php +++ b/lib/wiki-plugins/wikiplugin_colorbox.php @@ -13,7 +13,7 @@ function wikiplugin_colorbox_info() 'description' => tra('Display a gallery of images in a popup slideshow'), 'prefs' => array( 'feature_file_galleries', 'feature_shadowbox', 'wikiplugin_colorbox' ), 'introduced' => 5, - 'icon' => 'pics/icons/pictures.png', + 'icon' => 'img/icons/pictures.png', 'tags' => array( 'basic' ), 'params' => array( 'fgalId' => array( diff --git a/lib/wiki-plugins/wikiplugin_comment.php b/lib/wiki-plugins/wikiplugin_comment.php index 35754c6d217..2491799a9f2 100644 --- a/lib/wiki-plugins/wikiplugin_comment.php +++ b/lib/wiki-plugins/wikiplugin_comment.php @@ -13,7 +13,7 @@ function wikiplugin_comment_info() 'description' => tra('Display a comment area for any specified object'), 'prefs' => array( 'wikiplugin_comment' ), 'format' => 'html', - 'icon' => 'pics/icons/comments.png', + 'icon' => 'img/icons/comments.png', 'params' => array( 'objectType' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_content.php b/lib/wiki-plugins/wikiplugin_content.php index ac3b7e85fdd..6379ff76fc4 100644 --- a/lib/wiki-plugins/wikiplugin_content.php +++ b/lib/wiki-plugins/wikiplugin_content.php @@ -13,7 +13,7 @@ function wikiplugin_content_info() 'description' => tra('Display content from dynamic content repository'), 'prefs' => array( 'feature_dynamic_content', 'wikiplugin_content'), 'filter' => 'text', - 'icon' => 'pics/icons/database_table.png', + 'icon' => 'img/icons/database_table.png', 'tags' => array( 'basic' ), 'params' => array( 'id' => array( diff --git a/lib/wiki-plugins/wikiplugin_contributionsdashboard.php b/lib/wiki-plugins/wikiplugin_contributionsdashboard.php index 5452d2f8cca..f5c16232a74 100644 --- a/lib/wiki-plugins/wikiplugin_contributionsdashboard.php +++ b/lib/wiki-plugins/wikiplugin_contributionsdashboard.php @@ -15,7 +15,7 @@ function wikiplugin_contributionsdashboard_info() 'tags' => array( 'basic' ), 'body' => tra('Notice'), 'format' => 'html', - 'icon' => 'pics/icons/database_table.png', + 'icon' => 'img/icons/database_table.png', 'filter' => 'text', 'params' => array( 'start' => array( diff --git a/lib/wiki-plugins/wikiplugin_convene.php b/lib/wiki-plugins/wikiplugin_convene.php index e8d4dacd641..57b17a86cfa 100644 --- a/lib/wiki-plugins/wikiplugin_convene.php +++ b/lib/wiki-plugins/wikiplugin_convene.php @@ -14,7 +14,7 @@ function wikiplugin_convene_info() 'introduced' => 9.0, 'prefs' => array('wikiplugin_convene','feature_calendar'), 'body' => tra('Convene data generated from user input'), - 'icon' => 'pics/icons/arrow_in.png', + 'icon' => 'img/icons/arrow_in.png', 'filter' => 'rawhtml_unsafe', 'tags' => array( 'basic' ), 'params' => array( @@ -99,7 +99,7 @@ function wikiplugin_convene($data, $params) $dateHeader = ""; foreach ($votes as $stamp => $totals) { $dateHeader .= "<td>". $tikilib->get_long_datetime($stamp) . - ($tiki_p_edit == 'y' ? " <button class='conveneDeleteDate$i icon ui-widget-header ui-corner-all' data-date='$stamp'><img src='pics/icons/delete.png' title='" . tr("Delete Date") . "'/></button>" : ""). + ($tiki_p_edit == 'y' ? " <button class='conveneDeleteDate$i icon ui-widget-header ui-corner-all' data-date='$stamp'><img src='img/icons/delete.png' title='" . tr("Delete Date") . "'/></button>" : ""). "</td>"; } $result .= " @@ -109,9 +109,9 @@ function wikiplugin_convene($data, $params) $tiki_p_edit == 'y' ? "<button class='conveneAddUser$i icon ui-widget-header ui-corner-all' style='margin: 0px;'> - <img src='pics/icons/user.png' title='".tr('Add User')."' /> + <img src='img/icons/user.png' title='".tr('Add User')."' /> </button><button class='conveneAddDate$i icon ui-widget-header ui-corner-all' style='margin: 0px;'> - <img src='pics/icons/calendar_add.png' title='".tr('Add Date')."' /> + <img src='img/icons/calendar_add.png' title='".tr('Add Date')."' /> </button>" : "" ). @@ -125,10 +125,10 @@ function wikiplugin_convene($data, $params) $userList = ""; foreach ($rows as $user => $row) { $userList .= "<tr class='conveneUserVotes$i'>"; - $userList .= "<td>". ($tiki_p_edit == 'y' ? "<button class='conveneUpdateUser$i icon ui-widget-header ui-corner-all'><img src='pics/icons/pencil.png' title='" . tr("Edit User/Save changes") . "' /></button><button data-user='$user' title='" . tr("Delete User") . "' class='conveneDeleteUser$i icon ui-widget-header ui-corner-all'><img src='pics/icons/delete.png'/></button> " : "") . $user . "</td>"; + $userList .= "<td>". ($tiki_p_edit == 'y' ? "<button class='conveneUpdateUser$i icon ui-widget-header ui-corner-all'><img src='img/icons/pencil.png' title='" . tr("Edit User/Save changes") . "' /></button><button data-user='$user' title='" . tr("Delete User") . "' class='conveneDeleteUser$i icon ui-widget-header ui-corner-all'><img src='img/icons/delete.png'/></button> " : "") . $user . "</td>"; foreach ($row as $stamp => $vote) { $class = "ui-state-default ui-state-active"; - $text = ($vote == 1 ? "<img src='pics/icons/tick.png' alt='OK' class='vote' />" : "<img src='pics/icons/cross.png' class='vote' />" ); + $text = ($vote == 1 ? "<img src='img/icons/tick.png' alt='OK' class='vote' />" : "<img src='img/icons/cross.png' class='vote' />" ); $userList .= "<td class='$class'>". $text ."<input type='hidden' name='dates_" . $stamp . "_" . $user . "' value='$vote' class='conveneUserVote$i' />" @@ -150,9 +150,9 @@ function wikiplugin_convene($data, $params) foreach ($votes as $stamp => $total) { $pic = ""; if ($total == $votes[$topVoteStamp]) { - $pic .= ($tiki_p_edit != "y" ? "<img src='pics/icons/tick.png' class='icon' title='" . tr("Selected Date") . "' />" : ""); + $pic .= ($tiki_p_edit != "y" ? "<img src='img/icons/tick.png' class='icon' title='" . tr("Selected Date") . "' />" : ""); if ($tiki_p_edit == 'y') { - $pic .= "<button class='icon ui-widget-header ui-corner-all' onclick='document.location = $(this).find(\"a\").attr(\"href\"); return false;'><a href='tiki-calendar_edit_item.php?todate=$stamp&calendarId=1' title='" . tr("Add as Calendar Event") . "'><img src='pics/icons/calendar_add.png' class='icon' /></a></button>"; + $pic .= "<button class='icon ui-widget-header ui-corner-all' onclick='document.location = $(this).find(\"a\").attr(\"href\"); return false;'><a href='tiki-calendar_edit_item.php?todate=$stamp&calendarId=1' title='" . tr("Add as Calendar Event") . "'><img src='img/icons/calendar_add.png' class='icon' /></a></button>"; } } @@ -368,7 +368,7 @@ FORM; .removeClass('ui-state-default') .addClass('ui-state-highlight'); - $(this).find('img').attr('src', 'pics/icons/accept.png'); + $(this).find('img').attr('src', 'img/icons/accept.png'); var parent = $(this).parent().parent(); parent.find('.vote').hide(); parent.find('input').each(function() { @@ -390,7 +390,7 @@ FORM; .addClass('ui-state-default'); $('.conveneMain$i').show(); - $(this).find('img').attr('src', 'pics/icons/pencil.png'); + $(this).find('img').attr('src', 'img/icons/pencil.png'); var parent = $(this).parent().parent(); parent.find('.vote').show(); parent.find('input:checkbox').each(function(i) { diff --git a/lib/wiki-plugins/wikiplugin_cookie.php b/lib/wiki-plugins/wikiplugin_cookie.php index fb743744aab..e4b60682e6c 100644 --- a/lib/wiki-plugins/wikiplugin_cookie.php +++ b/lib/wiki-plugins/wikiplugin_cookie.php @@ -12,7 +12,7 @@ function wikiplugin_cookie_info() 'documentation' => 'PluginCookie', 'description' => tra('Display a rotating set of taglines or quotes (also known as fortune cookies)'), 'prefs' => array( 'wikiplugin_cookie' ), - 'icon' => 'pics/icons/quotes.png', + 'icon' => 'img/icons/quotes.png', 'tags' => array( 'basic' ), 'params' => array( ), diff --git a/lib/wiki-plugins/wikiplugin_copyright.php b/lib/wiki-plugins/wikiplugin_copyright.php index cb32196a84b..f0eaa493f74 100644 --- a/lib/wiki-plugins/wikiplugin_copyright.php +++ b/lib/wiki-plugins/wikiplugin_copyright.php @@ -15,7 +15,7 @@ function wikiplugin_copyright_info() 'description' => tra('Insert copyright notices'), 'prefs' => array( 'wiki_feature_copyrights', 'wikiplugin_copyright' ), 'body' => tra('Pattern to display the copyright in. May contain ~title~, ~year~ and ~authors~.'), - 'icon' => 'pics/icons/shield.png', + 'icon' => 'img/icons/shield.png', 'params' => array( ), ); diff --git a/lib/wiki-plugins/wikiplugin_countdown.php b/lib/wiki-plugins/wikiplugin_countdown.php index ee0bf7afcfc..592c93d3d6e 100644 --- a/lib/wiki-plugins/wikiplugin_countdown.php +++ b/lib/wiki-plugins/wikiplugin_countdown.php @@ -12,7 +12,7 @@ function wikiplugin_countdown_info() 'documentation' => 'PluginCountdown', 'description' => tra('Display a countdown to a specified date.'), 'prefs' => array('wikiplugin_countdown'), - 'icon' => 'pics/icons/clock.png', + 'icon' => 'img/icons/clock.png', 'body' => tra('Text to append to the countdown.'), 'tags' => array( 'basic' ), 'params' => array( diff --git a/lib/wiki-plugins/wikiplugin_customsearch.php b/lib/wiki-plugins/wikiplugin_customsearch.php index a6e8525cf48..c405cd0a208 100644 --- a/lib/wiki-plugins/wikiplugin_customsearch.php +++ b/lib/wiki-plugins/wikiplugin_customsearch.php @@ -14,7 +14,7 @@ function wikiplugin_customsearch_info() 'prefs' => array('wikiplugin_customsearch', 'wikiplugin_list', 'feature_ajax'), 'body' => tra('LIST plugin configuration information'), 'filter' => 'wikicontent', - 'icon' => 'pics/icons/text_list_bullets.png', + 'icon' => 'img/icons/text_list_bullets.png', 'tags' => array('advanced'), 'params' => array( 'wiki' => array( diff --git a/lib/wiki-plugins/wikiplugin_datachannel.php b/lib/wiki-plugins/wikiplugin_datachannel.php index 21695b9ceba..1b1815d5a9d 100644 --- a/lib/wiki-plugins/wikiplugin_datachannel.php +++ b/lib/wiki-plugins/wikiplugin_datachannel.php @@ -18,7 +18,7 @@ function wikiplugin_datachannel_info() tra('Where "fieldid" is the id (important) of the external input to use, and "fieldname" is the name of the parameter in the data-channel') . ' . ' . tra('To use fixed hidden preset values use "fieldname, hidden=value."'), 'extraparams' => true, - 'icon' => 'pics/icons/transmit_blue.png', + 'icon' => 'img/icons/transmit_blue.png', 'params' => array( 'channel' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_dbreport.php b/lib/wiki-plugins/wikiplugin_dbreport.php index 24038fce06f..4bf3a45f835 100644 --- a/lib/wiki-plugins/wikiplugin_dbreport.php +++ b/lib/wiki-plugins/wikiplugin_dbreport.php @@ -1512,7 +1512,7 @@ function wikiplugin_dbreport_info() 'prefs' => array('wikiplugin_dbreport'), 'body' => tra('report definition'), 'validate' => 'all', - 'icon' => 'pics/icons/database_table.png', + 'icon' => 'img/icons/database_table.png', 'params' => array( 'dsn' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_div.php b/lib/wiki-plugins/wikiplugin_div.php index d8c175fd5a0..0c67c840ffb 100644 --- a/lib/wiki-plugins/wikiplugin_div.php +++ b/lib/wiki-plugins/wikiplugin_div.php @@ -13,7 +13,7 @@ function wikiplugin_div_info() 'description' => tra('Define and format sections of a page or text'), 'prefs' => array('wikiplugin_div'), 'body' => tra('text'), - 'icon' => 'pics/icons/script_code_red.png', + 'icon' => 'img/icons/script_code_red.png', 'filter' => 'wikicontent', 'tags' => array( 'basic' ), 'params' => array( diff --git a/lib/wiki-plugins/wikiplugin_dl.php b/lib/wiki-plugins/wikiplugin_dl.php index 039a2a16535..870077040c0 100644 --- a/lib/wiki-plugins/wikiplugin_dl.php +++ b/lib/wiki-plugins/wikiplugin_dl.php @@ -13,7 +13,7 @@ function wikiplugin_dl_info() 'description' => tra('Create a definition list'), 'prefs' => array('wikiplugin_dl'), 'body' => tra('One entry per line. Each line is in "Term: Definition" format.'), - 'icon' => 'pics/icons/text_list_bullets.png', + 'icon' => 'img/icons/text_list_bullets.png', 'tags' => array( 'basic' ), 'params' => array( ), diff --git a/lib/wiki-plugins/wikiplugin_draw.php b/lib/wiki-plugins/wikiplugin_draw.php index 10517ae565e..b0194ce8458 100644 --- a/lib/wiki-plugins/wikiplugin_draw.php +++ b/lib/wiki-plugins/wikiplugin_draw.php @@ -12,7 +12,7 @@ function wikiplugin_draw_info() 'documentation' => 'PluginDraw', 'description' => tra('Display or create an image from TikiDraw that is stored into the File Gallery'), 'prefs' => array( 'feature_draw' , 'wikiplugin_draw'), - 'icon' => 'pics/icons/shape_square_edit.png', + 'icon' => 'img/icons/shape_square_edit.png', 'tags' => array( 'basic' ), 'params' => array( 'id' => array( @@ -131,7 +131,7 @@ EOF; if ($globalperms->upload_files == 'y') { $ret .= "<a href='tiki-edit_draw.php?fileId=$id&page=$page&index=$drawIndex&label=$label&width=$width&height=$height' onclick='return $(this).ajaxEditDraw();' title='Edit: ".$fileInfo['filename']."' data-fileid='".$fileInfo['fileId']."' data-galleryid='".$fileInfo['galleryId']."'> - <img src='pics/icons/page_edit.png' alt='$label' width='16' height='16' title='$label' class='icon' /> + <img src='img/icons/page_edit.png' alt='$label' width='16' height='16' title='$label' class='icon' /> </a>"; } diff --git a/lib/wiki-plugins/wikiplugin_equation.php b/lib/wiki-plugins/wikiplugin_equation.php index c39459b192b..2b56dd55a2a 100644 --- a/lib/wiki-plugins/wikiplugin_equation.php +++ b/lib/wiki-plugins/wikiplugin_equation.php @@ -13,7 +13,7 @@ function wikiplugin_equation_info() 'description' => tra('Render an equation written in LaTeX syntax as an image.'), 'prefs' => array('wikiplugin_equation'), 'body' => tra('equation'), - 'icon' => 'pics/icons/sum.png', + 'icon' => 'img/icons/sum.png', 'params' => array( 'size' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_events.php b/lib/wiki-plugins/wikiplugin_events.php index e96290a663e..75bbfab3fd2 100644 --- a/lib/wiki-plugins/wikiplugin_events.php +++ b/lib/wiki-plugins/wikiplugin_events.php @@ -12,7 +12,7 @@ function wikiplugin_events_info() 'documentation' => 'PluginEvents', 'description' => tra('Display upcoming events from calendars'), 'prefs' => array( 'feature_calendar', 'wikiplugin_events' ), - 'icon' => 'pics/icons/calendar_view_day.png', + 'icon' => 'img/icons/calendar_view_day.png', 'tags' => array( 'basic' ), 'params' => array( 'calendarid' => array( diff --git a/lib/wiki-plugins/wikiplugin_fade.php b/lib/wiki-plugins/wikiplugin_fade.php index fb273236e65..c1094762d8a 100644 --- a/lib/wiki-plugins/wikiplugin_fade.php +++ b/lib/wiki-plugins/wikiplugin_fade.php @@ -14,7 +14,7 @@ function wikiplugin_fade_info() 'prefs' => array('wikiplugin_fade'), 'body' => tra('Wiki syntax containing the content that can be hidden or shown.'), 'filter' => 'wikicontent', - 'icon' => 'pics/icons/wand.png', + 'icon' => 'img/icons/wand.png', 'tags' => array( 'basic' ), 'params' => array( 'label' => array( diff --git a/lib/wiki-plugins/wikiplugin_fancylist.php b/lib/wiki-plugins/wikiplugin_fancylist.php index 4ab74c76341..cb2e8b4594c 100644 --- a/lib/wiki-plugins/wikiplugin_fancylist.php +++ b/lib/wiki-plugins/wikiplugin_fancylist.php @@ -13,7 +13,7 @@ function wikiplugin_fancylist_info() 'description' => tra('Create a fancy-looking list'), 'prefs' => array('wikiplugin_fancylist'), 'body' => tra('One item per line starting with anything followed by ")".'), - 'icon' => 'pics/icons/text_list_bullets.png', + 'icon' => 'img/icons/text_list_bullets.png', 'tags' => array( 'basic' ), 'params' => array( 'div' => array( diff --git a/lib/wiki-plugins/wikiplugin_fancytable.php b/lib/wiki-plugins/wikiplugin_fancytable.php index abe79cebd38..eb47016ff15 100644 --- a/lib/wiki-plugins/wikiplugin_fancytable.php +++ b/lib/wiki-plugins/wikiplugin_fancytable.php @@ -13,7 +13,7 @@ function wikiplugin_fancytable_info() 'description' => tra('Create a formatted table'), 'prefs' => array('wikiplugin_fancytable'), 'body' => tra('Rows separated by >> in the header; for the table body, one row per line. Cells separated by | in both cases.'), - 'icon' => 'pics/icons/table.png', + 'icon' => 'img/icons/table.png', 'tags' => array( 'basic' ), 'params' => array( 'head' => array( diff --git a/lib/wiki-plugins/wikiplugin_file.php b/lib/wiki-plugins/wikiplugin_file.php index 6158b63aced..e2869730e1f 100644 --- a/lib/wiki-plugins/wikiplugin_file.php +++ b/lib/wiki-plugins/wikiplugin_file.php @@ -17,7 +17,7 @@ function wikiplugin_file_info() 'description' => tra('Link to a file that\'s attached or in a file gallery or archive. See PluginFiles for more functionality.'), 'prefs' => array( 'wikiplugin_file' ), 'body' => tra('Label for the link to the file (ignored if the file is a wiki attachment)'), - 'icon' => 'pics/icons/file-manager.png', + 'icon' => 'img/icons/file-manager.png', 'inline' => true, 'tags' => array( 'basic' ), 'params' => array( diff --git a/lib/wiki-plugins/wikiplugin_footnote.php b/lib/wiki-plugins/wikiplugin_footnote.php index 3031ae62d7a..2cd6abd721f 100644 --- a/lib/wiki-plugins/wikiplugin_footnote.php +++ b/lib/wiki-plugins/wikiplugin_footnote.php @@ -13,7 +13,7 @@ function wikiplugin_footnote_info() 'description' => tra('Create automatically numbered footnotes (together with PluginFootnoteArea)'), 'prefs' => array('wikiplugin_footnote'), 'body' => tra('The footnote'), - 'icon' => 'pics/icons/text_horizontalrule.png', + 'icon' => 'img/icons/text_horizontalrule.png', 'filter' => 'wikicontent', 'params' => array( 'sameas' => array( diff --git a/lib/wiki-plugins/wikiplugin_footnotearea.php b/lib/wiki-plugins/wikiplugin_footnotearea.php index 961c95b66b7..388c82a7005 100644 --- a/lib/wiki-plugins/wikiplugin_footnotearea.php +++ b/lib/wiki-plugins/wikiplugin_footnotearea.php @@ -12,7 +12,7 @@ function wikiplugin_footnotearea_info() 'documentation' => 'PluginFootnoteArea', 'description' => tra('Create automatically numbered footnotes (together with PluginFootnote)'), 'prefs' => array('wikiplugin_footnotearea'), - 'icon' => 'pics/icons/text_horizontalrule.png', + 'icon' => 'img/icons/text_horizontalrule.png', 'format' => 'html', 'params' => array(), ); diff --git a/lib/wiki-plugins/wikiplugin_freetagged.php b/lib/wiki-plugins/wikiplugin_freetagged.php index 6eef32b9c84..2b73c3e1fbf 100644 --- a/lib/wiki-plugins/wikiplugin_freetagged.php +++ b/lib/wiki-plugins/wikiplugin_freetagged.php @@ -12,7 +12,7 @@ function wikiplugin_freetagged_info() 'documentation' => 'PluginFreetagged', 'description' => tra('List similarly tagged objects'), 'prefs' => array('feature_freetags','wikiplugin_freetagged'), - 'icon' => 'pics/icons/tag_blue.png', + 'icon' => 'img/icons/tag_blue.png', 'params' => array( 'tags' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_ftp.php b/lib/wiki-plugins/wikiplugin_ftp.php index 00d071462f2..9e028465605 100644 --- a/lib/wiki-plugins/wikiplugin_ftp.php +++ b/lib/wiki-plugins/wikiplugin_ftp.php @@ -14,7 +14,7 @@ function wikiplugin_ftp_info() 'prefs' => array( 'wikiplugin_ftp' ), 'validate' => 'all', 'body' => tra('file name'), - 'icon' => 'pics/icons/application_put.png', + 'icon' => 'img/icons/application_put.png', 'params' => array( 'server' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_gauge.php b/lib/wiki-plugins/wikiplugin_gauge.php index 4922116e81b..762f376b2ae 100644 --- a/lib/wiki-plugins/wikiplugin_gauge.php +++ b/lib/wiki-plugins/wikiplugin_gauge.php @@ -13,7 +13,7 @@ function wikiplugin_gauge_info() 'description' => tra('Display a horizontal bar gauge'), 'prefs' => array('wikiplugin_gauge'), 'body' => tra('description'), - 'icon' => 'pics/icons/chart_bar.png', + 'icon' => 'img/icons/chart_bar.png', 'tags' => array( 'basic' ), 'params' => array( 'value' => array( diff --git a/lib/wiki-plugins/wikiplugin_googleanalytics.php b/lib/wiki-plugins/wikiplugin_googleanalytics.php index 582effc94e8..4604b85faf1 100644 --- a/lib/wiki-plugins/wikiplugin_googleanalytics.php +++ b/lib/wiki-plugins/wikiplugin_googleanalytics.php @@ -12,7 +12,7 @@ function wikiplugin_googleanalytics_info() 'documentation' => 'PluginGoogleAnalytics', 'description' => tra('Add the tracking code for Google Analytics'), 'prefs' => array( 'wikiplugin_googleanalytics' ), - 'icon' => 'pics/icons/chart_line.png', + 'icon' => 'img/icons/chart_line.png', 'params' => array( 'account' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_googledoc.php b/lib/wiki-plugins/wikiplugin_googledoc.php index 584bb351c3e..91903d574c0 100644 --- a/lib/wiki-plugins/wikiplugin_googledoc.php +++ b/lib/wiki-plugins/wikiplugin_googledoc.php @@ -14,7 +14,7 @@ function wikiplugin_googledoc_info() 'prefs' => array( 'wikiplugin_googledoc' ), 'body' => tra('Leave this empty.'), // 'validate' => 'all', - 'icon' => 'pics/icons/google.png', + 'icon' => 'img/icons/google.png', 'tags' => array( 'basic' ), 'params' => array( 'type' => array( diff --git a/lib/wiki-plugins/wikiplugin_googlemap.php b/lib/wiki-plugins/wikiplugin_googlemap.php index d5e8270cdf9..e911784cc18 100644 --- a/lib/wiki-plugins/wikiplugin_googlemap.php +++ b/lib/wiki-plugins/wikiplugin_googlemap.php @@ -13,7 +13,7 @@ function wikiplugin_googlemap_info() 'description' => tra('Display a Google map'), 'prefs' => array( 'wikiplugin_googlemap' ), 'format' => 'html', - 'icon' => 'pics/icons/google.png', + 'icon' => 'img/icons/google.png', 'tags' => array( 'basic' ), 'params' => array( 'type' => array( diff --git a/lib/wiki-plugins/wikiplugin_group.php b/lib/wiki-plugins/wikiplugin_group.php index c2e72ade43d..4705533b4bf 100644 --- a/lib/wiki-plugins/wikiplugin_group.php +++ b/lib/wiki-plugins/wikiplugin_group.php @@ -13,7 +13,7 @@ function wikiplugin_group_info() 'description' => tra('Display content based on the user\'s groups or friends'), 'body' => tra('Wiki text to display if conditions are met. The body may contain {ELSE}. Text after the marker will be displayed to users not matching the conditions.'), 'prefs' => array('wikiplugin_group'), - 'icon' => 'pics/icons/group.png', + 'icon' => 'img/icons/group.png', 'filter' => 'wikicontent', 'tags' => array( 'basic' ), 'params' => array( diff --git a/lib/wiki-plugins/wikiplugin_groupexpiry.php b/lib/wiki-plugins/wikiplugin_groupexpiry.php index d875e61776d..e0919f3949a 100644 --- a/lib/wiki-plugins/wikiplugin_groupexpiry.php +++ b/lib/wiki-plugins/wikiplugin_groupexpiry.php @@ -12,7 +12,7 @@ function wikiplugin_groupexpiry_info() 'documentation' => 'PluginGroupExpiry', 'description' => tra('Show the expiry date of a group membership of the current user'), 'prefs' => array( 'wikiplugin_groupexpiry' ), - 'icon' => 'pics/icons/group_delete.png', + 'icon' => 'img/icons/group_delete.png', 'params' => array( 'group' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_grouplist.php b/lib/wiki-plugins/wikiplugin_grouplist.php index 11d04e7db63..87550ef1f84 100644 --- a/lib/wiki-plugins/wikiplugin_grouplist.php +++ b/lib/wiki-plugins/wikiplugin_grouplist.php @@ -11,7 +11,7 @@ function wikiplugin_grouplist_info() 'name' => tra('Group List'), 'documentation' => 'PluginGroupList', 'description' => tra('List all groups or just groups that include a certain group'), - 'icon' => 'pics/icons/group.png', + 'icon' => 'img/icons/group.png', 'params' => array( 'group' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_groupmailcore.php b/lib/wiki-plugins/wikiplugin_groupmailcore.php index 751ca644787..59401bfee77 100644 --- a/lib/wiki-plugins/wikiplugin_groupmailcore.php +++ b/lib/wiki-plugins/wikiplugin_groupmailcore.php @@ -13,7 +13,7 @@ function wikiplugin_groupmailcore_info() 'description' => tra('Displays GroupMail functions on a wiki page. Usually set up using a plugin alias created by the GroupMail profile.'), 'prefs' => array('wikiplugin_groupmailcore', 'feature_trackers'), //'extraparams' => true, - 'icon' => 'pics/icons/email.png', + 'icon' => 'img/icons/email.png', 'tags' => array( 'experimental' ), 'params' => array( 'fromEmail' => array( diff --git a/lib/wiki-plugins/wikiplugin_groupstat.php b/lib/wiki-plugins/wikiplugin_groupstat.php index 4c3eda1f3ac..d01f4fe7dbd 100644 --- a/lib/wiki-plugins/wikiplugin_groupstat.php +++ b/lib/wiki-plugins/wikiplugin_groupstat.php @@ -12,7 +12,7 @@ function wikiplugin_groupstat_info() 'documentation' => 'PluginGroupStat', 'description' => tra('Show the distribution of users among groups'), 'body' => tra('Title'), - 'icon' => 'pics/icons/calculator.png', + 'icon' => 'img/icons/calculator.png', 'params' => array( 'groups' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_htmlfeed.php b/lib/wiki-plugins/wikiplugin_htmlfeed.php index bd219af8d0e..5e528889cd7 100644 --- a/lib/wiki-plugins/wikiplugin_htmlfeed.php +++ b/lib/wiki-plugins/wikiplugin_htmlfeed.php @@ -12,7 +12,7 @@ function wikiplugin_htmlfeed_info() 'documentation' => 'PluginHtmlFeed', 'description' => tra('Adds an item to html feed'), 'prefs' => array( 'feature_wiki', 'wikiplugin_htmlfeed' , 'feature_htmlfeed'), - 'icon' => 'pics/icons/link.png', + 'icon' => 'img/icons/link.png', 'params' => array( 'name' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_htmlfeedlink.php b/lib/wiki-plugins/wikiplugin_htmlfeedlink.php index aac2b6f07d0..adc5e0f9a9c 100644 --- a/lib/wiki-plugins/wikiplugin_htmlfeedlink.php +++ b/lib/wiki-plugins/wikiplugin_htmlfeedlink.php @@ -13,7 +13,7 @@ function wikiplugin_htmlfeedlink_info() 'description' => tra('Display remote content'), 'prefs' => array( 'feature_wiki', 'wikiplugin_htmlfeedlink', 'feature_htmlfeed' ), 'body' => tra('Initial Value'), - 'icon' => 'pics/icons/page_white_code.png', + 'icon' => 'img/icons/page_white_code.png', 'filter' => 'rawhtml_unsafe', 'tags' => array( 'basic' ), 'params' => array( @@ -175,7 +175,7 @@ function wikiplugin_htmlfeedlink($data, $params) if ($moderate == 'y') { if ($same == false) { $data .= "~np~<img - src='pics/icons/flag_blue.png' + src='img/icons/flag_blue.png' class='revision' title='Revision Available, click to see' style='cursor: pointer;' @@ -239,7 +239,7 @@ function wikiplugin_htmlfeedlink($data, $params) } if (strlen($archives) > 0) { - $result .= "~np~<img src='pics/icons/disk_multiple.png' id='viewArchives$htmlFeedLinkI' title='View Archives' name='".htmlspecialchars($archive->name)."' style='cursor: pointer;' /> + $result .= "~np~<img src='img/icons/disk_multiple.png' id='viewArchives$htmlFeedLinkI' title='View Archives' name='".htmlspecialchars($archive->name)."' style='cursor: pointer;' /> <div id='archives$htmlFeedLinkI' style='display: none;' >" . $archives . "</div>~/np~"; $headerlib->add_jq_onready( <<<JQ diff --git a/lib/wiki-plugins/wikiplugin_iframe.php b/lib/wiki-plugins/wikiplugin_iframe.php index d0ce1662140..b0e3e6130d9 100644 --- a/lib/wiki-plugins/wikiplugin_iframe.php +++ b/lib/wiki-plugins/wikiplugin_iframe.php @@ -16,7 +16,7 @@ function wikiplugin_iframe_info() 'format' => 'html', 'validate' => 'all', 'tags' => array( 'basic' ), - 'icon' => 'pics/icons/page_copy.png', + 'icon' => 'img/icons/page_copy.png', 'params' => array( 'name' => array( 'safe' => true, diff --git a/lib/wiki-plugins/wikiplugin_img.php b/lib/wiki-plugins/wikiplugin_img.php index da5eff96365..cc80755c996 100644 --- a/lib/wiki-plugins/wikiplugin_img.php +++ b/lib/wiki-plugins/wikiplugin_img.php @@ -12,7 +12,7 @@ function wikiplugin_img_info() 'documentation' => 'PluginImg', 'description' => tra('Display custom formatted images'), 'prefs' => array( 'wikiplugin_img'), - 'icon' => 'pics/icons/picture.png', + 'icon' => 'img/icons/picture.png', 'tags' => array( 'basic' ), 'params' => array( 'src' => array( @@ -1258,11 +1258,11 @@ function wikiplugin_img( $data, $params, $offset, $parseOptions='' ) if (!empty($titleonly)) { $repl .= ' title="' . $titleonly . '"'; } - $repl .= ">\r\t\t\t\t" . '<img class="magnify" src="./pics/icons/magnifier.png" alt="'.tra('Enlarge').'" /></a>' . "\r\t\t\t</div>"; + $repl .= ">\r\t\t\t\t" . '<img class="magnify" src="./img/icons/magnifier.png" alt="'.tra('Enlarge').'" /></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="./pics/icons/tag_blue.png" alt="' . tra('Metadata') . '" title="' . tra('Metadata') . '"/></a></div>'; + $repl .= '<div style="float:right; margin-right:2px"><a href="#" id="' . $id_link . '"><img src="./img/icons/tag_blue.png" alt="' . tra('Metadata') . '" title="' . tra('Metadata') . '"/></a></div>'; } //Add description based on user setting (use $desconly from above) and close divs isset($desconly) ? $repl .= $desconly : ''; @@ -1346,7 +1346,7 @@ function wikiplugin_img( $data, $params, $offset, $parseOptions='' ) } if ($prefs['feature_draw'] == 'y' && $tiki_p_upload_files == 'y') { - $repl .= $ret .= " <a href='tiki-edit_draw.php?fileId=" . $imgdata['fileId'] . "' onclick='return $(this).ajaxEditDraw();' title='".tr("Edit: Image")."' data-fileid='".$imgdata['fileId']."' data-galleryid='".$imgdata['galleryId']."'><img width='16' height='16' class='icon' alt='Edit' src='pics/icons/page_edit.png' /></a>"; + $repl .= $ret .= " <a href='tiki-edit_draw.php?fileId=" . $imgdata['fileId'] . "' onclick='return $(this).ajaxEditDraw();' title='".tr("Edit: Image")."' data-fileid='".$imgdata['fileId']."' data-galleryid='".$imgdata['galleryId']."'><img width='16' height='16' class='icon' alt='Edit' src='img/icons/page_edit.png' /></a>"; } return '~np~' . $repl. "\r" . '~/np~'; diff --git a/lib/wiki-plugins/wikiplugin_include.php b/lib/wiki-plugins/wikiplugin_include.php index 489c52f2c17..3bfc4658f5e 100644 --- a/lib/wiki-plugins/wikiplugin_include.php +++ b/lib/wiki-plugins/wikiplugin_include.php @@ -12,7 +12,7 @@ function wikiplugin_include_info() 'documentation' => 'PluginInclude', 'description' => tra('Include content from a wiki page'), 'prefs' => array('wikiplugin_include'), - 'icon' => 'pics/icons/page_copy.png', + 'icon' => 'img/icons/page_copy.png', 'tags' => array( 'basic' ), 'params' => array( 'page' => array( diff --git a/lib/wiki-plugins/wikiplugin_invite.php b/lib/wiki-plugins/wikiplugin_invite.php index df6b19fdc62..446eb241cc1 100644 --- a/lib/wiki-plugins/wikiplugin_invite.php +++ b/lib/wiki-plugins/wikiplugin_invite.php @@ -13,7 +13,7 @@ function wikiplugin_invite_info() 'description' => tra('Invite a user to join your groups'), 'prefs' => array( 'wikiplugin_invite' ), 'body' => tra('Confirmation message after posting form'), - 'icon' => 'pics/icons/group.png', + 'icon' => 'img/icons/group.png', 'params' => array( 'including' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_jabber.php b/lib/wiki-plugins/wikiplugin_jabber.php index 405b5722986..c1047342bdf 100644 --- a/lib/wiki-plugins/wikiplugin_jabber.php +++ b/lib/wiki-plugins/wikiplugin_jabber.php @@ -12,7 +12,7 @@ function wikiplugin_jabber_info() 'documentation' => 'PluginJabber', 'description' => tra('Chat using Jabber'), 'prefs' => array( 'wikiplugin_jabber' ), - 'icon' => 'pics/icons/comments.png', + 'icon' => 'img/icons/comments.png', 'params' => array( 'height' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_jq.php b/lib/wiki-plugins/wikiplugin_jq.php index 794f132651b..f89663cf0d6 100644 --- a/lib/wiki-plugins/wikiplugin_jq.php +++ b/lib/wiki-plugins/wikiplugin_jq.php @@ -15,7 +15,7 @@ function wikiplugin_jq_info() 'body' => tra('JavaScript code'), 'validate' => 'all', 'filter' => 'none', - 'icon' => 'pics/icons/script_code_red.png', + 'icon' => 'img/icons/script_code_red.png', 'params' => array( 'notonready' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_js.php b/lib/wiki-plugins/wikiplugin_js.php index 4e6d5619b90..9e9ef485302 100644 --- a/lib/wiki-plugins/wikiplugin_js.php +++ b/lib/wiki-plugins/wikiplugin_js.php @@ -15,7 +15,7 @@ function wikiplugin_js_info() 'body' => tra('javascript code'), 'validate' => 'all', 'filter' => 'rawhtml_unsafe', - 'icon' => 'pics/icons/script_code_red.png', + 'icon' => 'img/icons/script_code_red.png', 'tags' => array( 'basic' ), 'params' => array( 'file' => array( diff --git a/lib/wiki-plugins/wikiplugin_kaltura.php b/lib/wiki-plugins/wikiplugin_kaltura.php index c4278da154b..8349bc2e0bf 100644 --- a/lib/wiki-plugins/wikiplugin_kaltura.php +++ b/lib/wiki-plugins/wikiplugin_kaltura.php @@ -13,7 +13,7 @@ function wikiplugin_kaltura_info() 'description' => tra('Display a video created through the Kaltura feature'), 'prefs' => array('wikiplugin_kaltura', 'feature_kaltura'), 'extraparams' => true, - 'icon' => 'pics/icons/film_edit.png', + 'icon' => 'img/icons/film_edit.png', 'params' => array( 'id' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_lang.php b/lib/wiki-plugins/wikiplugin_lang.php index 22ec9ef0c11..b2b3de21912 100644 --- a/lib/wiki-plugins/wikiplugin_lang.php +++ b/lib/wiki-plugins/wikiplugin_lang.php @@ -13,7 +13,7 @@ function wikiplugin_lang_info() 'description' => tra('Vary text based on the page language'), 'prefs' => array( 'feature_multilingual', 'wikiplugin_lang' ), 'body' => tra('text'), - 'icon' => 'pics/icons/flag_blue.png', + 'icon' => 'img/icons/flag_blue.png', 'params' => array( 'lang' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_lastmod.php b/lib/wiki-plugins/wikiplugin_lastmod.php index 4d64e2f2f90..f73638496ea 100644 --- a/lib/wiki-plugins/wikiplugin_lastmod.php +++ b/lib/wiki-plugins/wikiplugin_lastmod.php @@ -12,7 +12,7 @@ function wikiplugin_lastmod_info() 'documentation' => 'PluginLastMod', 'description' => tra('Show the last modification date for a page'), 'prefs' => array('feature_wiki', 'wikiplugin_lastmod'), - 'icon' => 'pics/icons/date_edit.png', + 'icon' => 'img/icons/date_edit.png', 'params' => array( 'page' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_list.php b/lib/wiki-plugins/wikiplugin_list.php index 566e092269f..769486ceca5 100644 --- a/lib/wiki-plugins/wikiplugin_list.php +++ b/lib/wiki-plugins/wikiplugin_list.php @@ -14,7 +14,7 @@ function wikiplugin_list_info() 'prefs' => array('wikiplugin_list'), 'body' => tra('List configuration information'), 'filter' => 'wikicontent', - 'icon' => 'pics/icons/text_list_bullets.png', + 'icon' => 'img/icons/text_list_bullets.png', 'tags' => array( 'basic' ), 'params' => array( ), diff --git a/lib/wiki-plugins/wikiplugin_listpages.php b/lib/wiki-plugins/wikiplugin_listpages.php index 7f276009b5b..9db3825f77f 100644 --- a/lib/wiki-plugins/wikiplugin_listpages.php +++ b/lib/wiki-plugins/wikiplugin_listpages.php @@ -12,7 +12,7 @@ function wikiplugin_listpages_info() 'documentation' => 'PluginListpages', 'description' => tra('List pages based on various criteria'), 'prefs' => array('wikiplugin_listpages'), - 'icon' => 'pics/icons/page_find.png', + 'icon' => 'img/icons/page_find.png', 'params' => array( 'offset' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_lsdir.php b/lib/wiki-plugins/wikiplugin_lsdir.php index db705b2fe35..f3374f6d120 100644 --- a/lib/wiki-plugins/wikiplugin_lsdir.php +++ b/lib/wiki-plugins/wikiplugin_lsdir.php @@ -13,7 +13,7 @@ function wikiplugin_lsdir_info() 'description' => tra('Lists files in a directory'), 'prefs' => array( 'wikiplugin_lsdir' ), 'validate' => 'all', - 'icon' => 'pics/icons/folder_find.png', + 'icon' => 'img/icons/folder_find.png', 'params' => array( 'dir' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_mail.php b/lib/wiki-plugins/wikiplugin_mail.php index b3d23020a55..7b391a36804 100644 --- a/lib/wiki-plugins/wikiplugin_mail.php +++ b/lib/wiki-plugins/wikiplugin_mail.php @@ -15,7 +15,7 @@ function wikiplugin_mail_info() 'description' => tra('Directly mail other users or groups'), 'validate' => 'all', 'prefs' => array('wikiplugin_mail'), - 'icon' => 'pics/icons/email.png', + 'icon' => 'img/icons/email.png', 'params' => array( 'group' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_map.php b/lib/wiki-plugins/wikiplugin_map.php index 6ec42837bd1..a08c0758d65 100644 --- a/lib/wiki-plugins/wikiplugin_map.php +++ b/lib/wiki-plugins/wikiplugin_map.php @@ -13,7 +13,7 @@ function wikiplugin_map_info() 'documentation' => 'PluginMap', 'description' => tra('Display a map'), 'prefs' => array( 'wikiplugin_map' ), - 'icon' => 'pics/icons/map.png', + 'icon' => 'img/icons/map.png', 'tags' => array( 'basic' ), 'filter' => 'wikicontent', 'body' => tr('Instructions to load content'), diff --git a/lib/wiki-plugins/wikiplugin_mcalendar.php b/lib/wiki-plugins/wikiplugin_mcalendar.php index e385a8bb49b..0f4c6938174 100644 --- a/lib/wiki-plugins/wikiplugin_mcalendar.php +++ b/lib/wiki-plugins/wikiplugin_mcalendar.php @@ -141,7 +141,7 @@ function wikiplugin_mcalendar_info() 'documentation' => 'PluginMCalendarInfo', 'description' => tra('Convert a Gregorian date to a Mayan calendar date'), 'prefs' => array('wikiplugin_mcalendar'), - 'icon' => 'pics/icons/calendar.png', + 'icon' => 'img/icons/calendar.png', 'params' => array( 'template' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_memberlist.php b/lib/wiki-plugins/wikiplugin_memberlist.php index 45a2517590f..7e7f5f6c967 100644 --- a/lib/wiki-plugins/wikiplugin_memberlist.php +++ b/lib/wiki-plugins/wikiplugin_memberlist.php @@ -13,7 +13,7 @@ function wikiplugin_memberlist_info() 'description' => tra('List and allow editing of group members'), 'prefs' => array( 'wikiplugin_memberlist' ), 'filter' => 'wikicontent', - 'icon' => 'pics/icons/group_gear.png', + 'icon' => 'img/icons/group_gear.png', 'params' => array( 'groups' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_memberpayment.php b/lib/wiki-plugins/wikiplugin_memberpayment.php index 2ffe830c85f..8454b3c7bbe 100644 --- a/lib/wiki-plugins/wikiplugin_memberpayment.php +++ b/lib/wiki-plugins/wikiplugin_memberpayment.php @@ -15,7 +15,7 @@ function wikiplugin_memberpayment_info() 'description' => tra('Receive payments from a member to extend membership to a group.'), 'validate' => 'all', 'prefs' => array( 'wikiplugin_memberpayment', 'payment_feature' ), - 'icon' => 'pics/icons/money.png', + 'icon' => 'img/icons/money.png', 'params' => array( 'group' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_miniquiz.php b/lib/wiki-plugins/wikiplugin_miniquiz.php index 01ec3ba199c..9480d48681e 100644 --- a/lib/wiki-plugins/wikiplugin_miniquiz.php +++ b/lib/wiki-plugins/wikiplugin_miniquiz.php @@ -13,7 +13,7 @@ function wikiplugin_miniquiz_info() 'description' => tra('Create a quiz using a tracker'), 'prefs' => array( 'feature_trackers', 'wikiplugin_miniquiz' ), 'body' => tra('Instructions::Feedback'), - 'icon' => 'pics/icons/green_question.png', + 'icon' => 'img/icons/green_question.png', 'params' => array( 'trackerId' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_module.php b/lib/wiki-plugins/wikiplugin_module.php index 36712da3ad0..13a6b04817d 100644 --- a/lib/wiki-plugins/wikiplugin_module.php +++ b/lib/wiki-plugins/wikiplugin_module.php @@ -31,7 +31,7 @@ function wikiplugin_module_info() 'description' => tra('Display a module'), 'prefs' => array( 'wikiplugin_module' ), 'validate' => 'all', - 'icon' => 'pics/icons/module.png', + 'icon' => 'img/icons/module.png', 'extraparams' =>true, 'tags' => array( 'basic' ), 'params' => array( diff --git a/lib/wiki-plugins/wikiplugin_mono.php b/lib/wiki-plugins/wikiplugin_mono.php index ccd607b0054..42539cbd6e7 100644 --- a/lib/wiki-plugins/wikiplugin_mono.php +++ b/lib/wiki-plugins/wikiplugin_mono.php @@ -13,7 +13,7 @@ function wikiplugin_mono_info() 'description' => tra('Display text in a monospace font'), 'prefs' => array( 'wikiplugin_mono' ), 'body' => tra('text'), - 'icon' => 'pics/icons/font.png', + 'icon' => 'img/icons/font.png', 'params' => array( 'font' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_mouseover.php b/lib/wiki-plugins/wikiplugin_mouseover.php index 7abac6f7ed4..808071ed678 100644 --- a/lib/wiki-plugins/wikiplugin_mouseover.php +++ b/lib/wiki-plugins/wikiplugin_mouseover.php @@ -22,7 +22,7 @@ function wikiplugin_mouseover_info() 'description' => tra('Display hidden content by mousing over a text'), 'prefs' => array( 'wikiplugin_mouseover' ), 'body' => tra('Hidden content, unless the label parameter is undefined, in which case this is the label.'), - 'icon' => 'pics/icons/comment_add.png', + 'icon' => 'img/icons/comment_add.png', 'tags' => array( 'basic' ), 'params' => array( 'label' => array( diff --git a/lib/wiki-plugins/wikiplugin_mwtable.php b/lib/wiki-plugins/wikiplugin_mwtable.php index 6bbfb20b69d..33664688a9d 100644 --- a/lib/wiki-plugins/wikiplugin_mwtable.php +++ b/lib/wiki-plugins/wikiplugin_mwtable.php @@ -14,7 +14,7 @@ function wikiplugin_mwtable_info() 'prefs' => array( 'wikiplugin_mwtable' ), 'body' => tra('URL'), 'validate' => 'all', - 'icon' => 'pics/icons/table.png', + 'icon' => 'img/icons/table.png', 'params' => array( 'fancy' => array( 'safe' => true, diff --git a/lib/wiki-plugins/wikiplugin_myspace.php b/lib/wiki-plugins/wikiplugin_myspace.php index 499a794e41d..19861d8f6f9 100644 --- a/lib/wiki-plugins/wikiplugin_myspace.php +++ b/lib/wiki-plugins/wikiplugin_myspace.php @@ -12,7 +12,7 @@ function wikiplugin_myspace_info() 'documentation' => 'PluginMySpace', 'description' => tra('Display a MySpace Flash mp3 playlist'), 'prefs' => array( 'wikiplugin_myspace' ), - 'icon' => 'pics/icons/myspace.png', + 'icon' => 'img/icons/myspace.png', 'params' => array( 'page' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_now.php b/lib/wiki-plugins/wikiplugin_now.php index d8e4d25777f..dedc639f4d6 100644 --- a/lib/wiki-plugins/wikiplugin_now.php +++ b/lib/wiki-plugins/wikiplugin_now.php @@ -12,7 +12,7 @@ function wikiplugin_now_info() { 'description' => tra('Display the current date or time'), 'prefs' => array('wikiplugin_now'), 'body' => tra('text'), - 'icon' => 'pics/icons/layout_header.png', + 'icon' => 'img/icons/layout_header.png', 'tags' => array( 'basic' ), 'params' => array( 'format' => array( diff --git a/lib/wiki-plugins/wikiplugin_objecthits.php b/lib/wiki-plugins/wikiplugin_objecthits.php index 633f4efd1fa..06fff1590d3 100644 --- a/lib/wiki-plugins/wikiplugin_objecthits.php +++ b/lib/wiki-plugins/wikiplugin_objecthits.php @@ -12,7 +12,7 @@ function wikiplugin_objecthits_info() 'documentation' => 'PluginObjectHits', 'description' => tra('Display the number of hits for certain objects'), 'prefs' => array( 'wikiplugin_objecthits' ), - 'icon' => 'pics/icons/calculator.png', + 'icon' => 'img/icons/calculator.png', 'params' => array( 'object' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_param.php b/lib/wiki-plugins/wikiplugin_param.php index d4625dece31..92e90d61a10 100644 --- a/lib/wiki-plugins/wikiplugin_param.php +++ b/lib/wiki-plugins/wikiplugin_param.php @@ -15,7 +15,7 @@ function wikiplugin_param_info() 'description' => tra('Display content based on URL parameters'), 'prefs' => array( 'wikiplugin_param' ), 'body' => tra('Wiki text to display if conditions are met. The body may contain {ELSE}. Text after the marker will be displayed if conditions are not met.'), - 'icon' => 'pics/icons/page_gear.png', + 'icon' => 'img/icons/page_gear.png', 'params' => array( 'name' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_payment.php b/lib/wiki-plugins/wikiplugin_payment.php index f79b1fe5154..bf347110e9f 100644 --- a/lib/wiki-plugins/wikiplugin_payment.php +++ b/lib/wiki-plugins/wikiplugin_payment.php @@ -12,7 +12,7 @@ function wikiplugin_payment_info() 'documentaion' => 'PluginPayment', 'description' => tra('Show details of a payment request or invoice'), 'prefs' => array( 'wikiplugin_payment', 'payment_feature' ), - 'icon' => 'pics/icons/money.png', + 'icon' => 'img/icons/money.png', 'params' => array( 'id' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_perm.php b/lib/wiki-plugins/wikiplugin_perm.php index b22b28c4e30..5f78171b7ce 100644 --- a/lib/wiki-plugins/wikiplugin_perm.php +++ b/lib/wiki-plugins/wikiplugin_perm.php @@ -14,8 +14,8 @@ function wikiplugin_perm_info() 'body' => tra('Wiki text to display if conditions are met. The body may contain {ELSE}. Text after the marker will be displayed to users not matching the conditions.'), 'prefs' => array('wikiplugin_perm'), 'filter' => 'wikicontent', - 'icon' => 'pics/icons/.png', - 'icon' => 'pics/icons/page_white_key.png', + 'icon' => 'img/icons/.png', + 'icon' => 'img/icons/page_white_key.png', 'params' => array( 'perms' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_pluginmanager.php b/lib/wiki-plugins/wikiplugin_pluginmanager.php index ef6eda638ba..60b0baa5f53 100644 --- a/lib/wiki-plugins/wikiplugin_pluginmanager.php +++ b/lib/wiki-plugins/wikiplugin_pluginmanager.php @@ -324,7 +324,7 @@ function wikiplugin_pluginmanager_info() 'description' => tra('List wiki plugin or module information for the site'), 'prefs' => array( 'wikiplugin_pluginmanager' ), 'introduced' => 3, - 'icon' => 'pics/icons/plugin_link.png', + 'icon' => 'img/icons/plugin_link.png', 'params' => array( 'info' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_poll.php b/lib/wiki-plugins/wikiplugin_poll.php index df11982caf1..d639192afc9 100644 --- a/lib/wiki-plugins/wikiplugin_poll.php +++ b/lib/wiki-plugins/wikiplugin_poll.php @@ -13,7 +13,7 @@ function wikiplugin_poll_info() 'description' => tra('Display a poll'), 'prefs' => array( 'feature_polls', 'wikiplugin_poll' ), 'body' => tra('Title'), - 'icon' => 'pics/icons/thumb_up.png', + 'icon' => 'img/icons/thumb_up.png', 'tags' => array( 'basic' ), 'params' => array( 'pollId' => array( diff --git a/lib/wiki-plugins/wikiplugin_profile.php b/lib/wiki-plugins/wikiplugin_profile.php index 1b0ce06478f..01a910e5d9a 100644 --- a/lib/wiki-plugins/wikiplugin_profile.php +++ b/lib/wiki-plugins/wikiplugin_profile.php @@ -14,7 +14,7 @@ function wikiplugin_profile_info() 'prefs' => array( 'wikiplugin_profile' ), 'validate' => 'all', 'inline' => true, - 'icon' => 'pics/icons/database_lightning.png', + 'icon' => 'img/icons/database_lightning.png', 'tags' => array( 'experimental' ), 'params' => array( 'domain' => array( diff --git a/lib/wiki-plugins/wikiplugin_proposal.php b/lib/wiki-plugins/wikiplugin_proposal.php index 85418aa6bef..abe51b527d7 100644 --- a/lib/wiki-plugins/wikiplugin_proposal.php +++ b/lib/wiki-plugins/wikiplugin_proposal.php @@ -13,7 +13,7 @@ function wikiplugin_proposal_info() 'description' => tra('Allow users to vote on a proposal and view the results'), 'prefs' => array( 'wikiplugin_proposal' ), 'body' => tra('The list of votes cast. One vote per line. Either 0, +1 or -1 followed by a username.'), - 'icon' => 'pics/icons/thumb_up.png', + 'icon' => 'img/icons/thumb_up.png', 'tags' => array( 'basic' ), 'params' => array( 'caption' => array( diff --git a/lib/wiki-plugins/wikiplugin_quote.php b/lib/wiki-plugins/wikiplugin_quote.php index 2f987778458..d15ced26a09 100644 --- a/lib/wiki-plugins/wikiplugin_quote.php +++ b/lib/wiki-plugins/wikiplugin_quote.php @@ -13,7 +13,7 @@ function wikiplugin_quote_info() 'description' => tra('Format text as a quote'), 'prefs' => array( 'wikiplugin_quote' ), 'body' => tra('Quoted text'), - 'icon' => 'pics/icons/quotes.png', + 'icon' => 'img/icons/quotes.png', 'filter' => 'text', 'tags' => array( 'basic' ), 'params' => array( diff --git a/lib/wiki-plugins/wikiplugin_randominclude.php b/lib/wiki-plugins/wikiplugin_randominclude.php index ed75257361d..679ecf9abd2 100644 --- a/lib/wiki-plugins/wikiplugin_randominclude.php +++ b/lib/wiki-plugins/wikiplugin_randominclude.php @@ -12,7 +12,7 @@ function wikiplugin_randominclude_info() 'documentation' => 'PluginRandomInclude', 'description' => tra('Include a random page\'s content.'), 'prefs' => array('wikiplugin_randominclude'), - 'icon' => 'pics/icons/page_copy.png', + 'icon' => 'img/icons/page_copy.png', 'params' => array(), ); } diff --git a/lib/wiki-plugins/wikiplugin_rcontent.php b/lib/wiki-plugins/wikiplugin_rcontent.php index 0e237dab02f..2432405f706 100644 --- a/lib/wiki-plugins/wikiplugin_rcontent.php +++ b/lib/wiki-plugins/wikiplugin_rcontent.php @@ -12,7 +12,7 @@ function wikiplugin_rcontent_info() 'documentation' => 'PluginRcontent', 'description' => tra('Display pre-programmed changing content'), 'prefs' => array( 'feature_dynamic_content', 'wikiplugin_rcontent' ), - 'icon' => 'pics/icons/database_table.png', + 'icon' => 'img/icons/database_table.png', 'params' => array( 'id' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_realnamelist.php b/lib/wiki-plugins/wikiplugin_realnamelist.php index 1f90a08da2f..83c787f04ae 100644 --- a/lib/wiki-plugins/wikiplugin_realnamelist.php +++ b/lib/wiki-plugins/wikiplugin_realnamelist.php @@ -13,7 +13,7 @@ function wikiplugin_realnamelist_info() 'description' => tra('Show user real names for members of a group').tra(' (experimental, should be merged with UserList)'), 'prefs' => array( 'wikiplugin_realnamelist' ), 'body' => tra('Group name - only users belonging to a group or groups with group names containing this text will be included in the list. If empty all site users will be included.'), - 'icon' => 'pics/icons/group.png', + 'icon' => 'img/icons/group.png', 'params' => array( 'sep' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_redirect.php b/lib/wiki-plugins/wikiplugin_redirect.php index 655e980df63..8e16970e5af 100644 --- a/lib/wiki-plugins/wikiplugin_redirect.php +++ b/lib/wiki-plugins/wikiplugin_redirect.php @@ -13,7 +13,7 @@ function wikiplugin_redirect_info() 'description' => tra('Redirect to another page'), 'prefs' => array( 'wikiplugin_redirect' ), 'validate' => 'arguments', - 'icon' => 'pics/icons/arrow_right.png', + 'icon' => 'img/icons/arrow_right.png', 'tags' => array( 'basic' ), 'params' => array( 'page' => array( diff --git a/lib/wiki-plugins/wikiplugin_regex.php b/lib/wiki-plugins/wikiplugin_regex.php index ab73c536537..a3d291e6b17 100644 --- a/lib/wiki-plugins/wikiplugin_regex.php +++ b/lib/wiki-plugins/wikiplugin_regex.php @@ -14,7 +14,7 @@ function wikiplugin_regex_info() 'description' => tra('Perform a regular expression search and replace'), 'prefs' => array( 'wikiplugin_regex' ), 'body' => tra('Each line of content is evaluated separately'), - 'icon' => 'pics/icons/text_replace.png', + 'icon' => 'img/icons/text_replace.png', 'params' => array( 'pageName' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_remarksbox.php b/lib/wiki-plugins/wikiplugin_remarksbox.php index 354717f54b8..22aedaaa4d5 100644 --- a/lib/wiki-plugins/wikiplugin_remarksbox.php +++ b/lib/wiki-plugins/wikiplugin_remarksbox.php @@ -13,7 +13,7 @@ function wikiplugin_remarksbox_info() 'description' => tra('Displays a comment, tip, note or warning box'), 'prefs' => array( 'wikiplugin_remarksbox' ), 'body' => tra('remarks text'), - 'icon' => 'pics/icons/comment_add.png', + 'icon' => 'img/icons/comment_add.png', 'tags' => array( 'basic' ), 'params' => array( 'type' => array( diff --git a/lib/wiki-plugins/wikiplugin_report.php b/lib/wiki-plugins/wikiplugin_report.php index 9a8fd73aad8..9ed15c6885b 100644 --- a/lib/wiki-plugins/wikiplugin_report.php +++ b/lib/wiki-plugins/wikiplugin_report.php @@ -132,7 +132,7 @@ function wikiplugin_report( $data, $params ) <input type='hidden' name='params[view]' value='$view' /> </form> <a href='#' title='".tr('Edit Report')."' onclick='return editReport$i(this);'> - <img src='pics/icons/page_edit.png' alt='$label' width='16' height='16' title='$label' class='icon' /> + <img src='img/icons/page_edit.png' alt='$label' width='16' height='16' title='$label' class='icon' /> </a>"; } return "~np~" . $result . "~/np~"; diff --git a/lib/wiki-plugins/wikiplugin_rss.php b/lib/wiki-plugins/wikiplugin_rss.php index 6a264312667..6479ccbb6ef 100644 --- a/lib/wiki-plugins/wikiplugin_rss.php +++ b/lib/wiki-plugins/wikiplugin_rss.php @@ -12,7 +12,7 @@ function wikiplugin_rss_info() 'documentation' => 'PluginRSS', 'description' => tra('Display items from an RSS feed'), 'prefs' => array( 'wikiplugin_rss' ), - 'icon' => 'pics/icons/rss.png', + 'icon' => 'img/icons/rss.png', 'format' => 'html', 'filter' => 'striptags', 'tags' => array( 'basic' ), diff --git a/lib/wiki-plugins/wikiplugin_scroll.php b/lib/wiki-plugins/wikiplugin_scroll.php index 3132b5d75d0..37147d98f9a 100644 --- a/lib/wiki-plugins/wikiplugin_scroll.php +++ b/lib/wiki-plugins/wikiplugin_scroll.php @@ -13,7 +13,7 @@ function wikiplugin_scroll_info() 'description' => tra('Show animated text that scrolls up or down'), 'prefs' => array('wikiplugin_scroll'), 'body' => tra('text'), - 'icon' => 'pics/icons/script.png', + 'icon' => 'img/icons/script.png', 'tags' => array( 'basic' ), 'params' => array( 'width' => array( diff --git a/lib/wiki-plugins/wikiplugin_sf.php b/lib/wiki-plugins/wikiplugin_sf.php index c4b2d4686b1..b7364f67f92 100644 --- a/lib/wiki-plugins/wikiplugin_sf.php +++ b/lib/wiki-plugins/wikiplugin_sf.php @@ -15,7 +15,7 @@ function wikiplugin_sf_info() 'description' => tra('Creates a link to SourceForge tracker items'), 'prefs' => array( 'wikiplugin_sf' ), 'body' => tra('text'), - 'icon' => 'pics/icons/world_link.png', + 'icon' => 'img/icons/world_link.png', 'params' => array( 'groupid' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_sharethis.php b/lib/wiki-plugins/wikiplugin_sharethis.php index a4f3d412fe6..a04ad6ec14b 100644 --- a/lib/wiki-plugins/wikiplugin_sharethis.php +++ b/lib/wiki-plugins/wikiplugin_sharethis.php @@ -12,7 +12,7 @@ function wikiplugin_sharethis_info() 'documentation' => 'PluginSharethis', 'description' => tra('Add a ShareThis button'), 'prefs' => array( 'wikiplugin_sharethis' ), - 'icon' => 'pics/icons/sharethis.png', + 'icon' => 'img/icons/sharethis.png', 'tags' => array( 'basic' ), 'params' => array( 'sendsvcs' => array( diff --git a/lib/wiki-plugins/wikiplugin_sheet.php b/lib/wiki-plugins/wikiplugin_sheet.php index 526d44aca45..255a2945951 100644 --- a/lib/wiki-plugins/wikiplugin_sheet.php +++ b/lib/wiki-plugins/wikiplugin_sheet.php @@ -13,7 +13,7 @@ function wikiplugin_sheet_info() 'description' => tra('Display data from a TikiSheet'), 'prefs' => array( 'wikiplugin_sheet', 'feature_sheet' ), 'body' => tra('Sheet Heading'), - 'icon' => 'pics/icons/sheet_get_range.png', + 'icon' => 'img/icons/sheet_get_range.png', 'tags' => array( 'basic' ), 'params' => array( 'id' => array( diff --git a/lib/wiki-plugins/wikiplugin_showpages.php b/lib/wiki-plugins/wikiplugin_showpages.php index 92def699f50..247f4387ec1 100644 --- a/lib/wiki-plugins/wikiplugin_showpages.php +++ b/lib/wiki-plugins/wikiplugin_showpages.php @@ -12,7 +12,7 @@ function wikiplugin_showpages_info() 'documentation' => 'PluginShowPages', 'description' => tra('Find pages by searching within page names'), 'prefs' => array( 'wikiplugin_showpages' ), - 'icon' => 'pics/icons/page_find.png', + 'icon' => 'img/icons/page_find.png', 'params' => array( 'find' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_slider.php b/lib/wiki-plugins/wikiplugin_slider.php index 5723c0a2303..b47c43ba670 100644 --- a/lib/wiki-plugins/wikiplugin_slider.php +++ b/lib/wiki-plugins/wikiplugin_slider.php @@ -13,7 +13,7 @@ function wikiplugin_slider_info() 'description' => tra('Arrange content in a sliding area'), 'prefs' => array( 'wikiplugin_slider' ), 'body' => tra('Content separated by /////'), - 'icon' => 'pics/icons/cool.gif', + 'icon' => 'img/icons/cool.gif', 'tags' => array( 'basic' ), 'params' => array( 'titles' => array( diff --git a/lib/wiki-plugins/wikiplugin_slideshow.php b/lib/wiki-plugins/wikiplugin_slideshow.php index 2390ed42c37..65471a659a2 100644 --- a/lib/wiki-plugins/wikiplugin_slideshow.php +++ b/lib/wiki-plugins/wikiplugin_slideshow.php @@ -13,7 +13,7 @@ function wikiplugin_slideshow_info() 'description' => tra('Configure a slideshow. Extends the existing wiki page slideshow with notes & styles.'), 'prefs' => array( 'wikiplugin_slideshow', 'feature_slideshow', 'wiki_uses_slides' ), 'body' => tra('Slideshow notes - Separate with "/////"'), - 'icon' => 'pics/icons/images.png', + 'icon' => 'img/icons/images.png', 'tags' => array( 'basic' ), 'params' => array( 'theme' => array( diff --git a/lib/wiki-plugins/wikiplugin_smarty.php b/lib/wiki-plugins/wikiplugin_smarty.php index 322eecb3e06..72540b1e4ec 100644 --- a/lib/wiki-plugins/wikiplugin_smarty.php +++ b/lib/wiki-plugins/wikiplugin_smarty.php @@ -15,7 +15,7 @@ function wikiplugin_smarty_info() 'validate' => 'all', 'extraparams' => true, 'tags' => array( 'experimental' ), - 'icon' => 'pics/icons/task_submitted.png', + 'icon' => 'img/icons/task_submitted.png', 'params' => array( 'name' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_snarf.php b/lib/wiki-plugins/wikiplugin_snarf.php index cc7985d1ae2..39146a34642 100644 --- a/lib/wiki-plugins/wikiplugin_snarf.php +++ b/lib/wiki-plugins/wikiplugin_snarf.php @@ -13,7 +13,7 @@ function wikiplugin_snarf_info() 'description' => tra('Display the contents of another web page'), 'prefs' => array( 'wikiplugin_snarf' ), 'validate' => 'all', - 'icon' => 'pics/icons/page_copy.png', + 'icon' => 'img/icons/page_copy.png', 'params' => array( 'url' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_sort.php b/lib/wiki-plugins/wikiplugin_sort.php index 9152a50f3c0..b56cb7f8a1a 100644 --- a/lib/wiki-plugins/wikiplugin_sort.php +++ b/lib/wiki-plugins/wikiplugin_sort.php @@ -14,7 +14,7 @@ function wikiplugin_sort_info() 'prefs' => array( 'wikiplugin_sort' ), 'body' => tra('Data to sort, one entry per line.'), 'filter' => 'text', - 'icon' => 'pics/icons/table_sort.png', + 'icon' => 'img/icons/table_sort.png', 'tags' => array( 'basic' ), 'params' => array( 'sort' => array( diff --git a/lib/wiki-plugins/wikiplugin_split.php b/lib/wiki-plugins/wikiplugin_split.php index e7463c0fe46..aef1a651d66 100644 --- a/lib/wiki-plugins/wikiplugin_split.php +++ b/lib/wiki-plugins/wikiplugin_split.php @@ -13,7 +13,7 @@ function wikiplugin_split_info() 'description' => tra('Easily arrange content on a page into rows and columns'), 'prefs' => array( 'wikiplugin_split' ), 'filter' => 'wikicontent', - 'icon' => 'pics/icons/table.png', + 'icon' => 'img/icons/table.png', 'tags' => array( 'basic' ), 'params' => array( 'joincols' => array( @@ -225,7 +225,7 @@ function wikiplugin_split($data, $params, $pos) $result .= '<div class="split"><div style="float:right">'; $result .= "$pos-$icell-".htmlspecialchars(substr($data, $pos, 10)); $result .= '<a href="tiki-editpage.php?page='.$object.'&pos='.$pos.'&cell='.$icell.'">' - .'<img src="pics/icons/page_edit.png" alt="'.tra('Edit').'" title="'.tra('Edit').'" width="16" height="16" /></a></div><br />'; + .'<img src="img/icons/page_edit.png" alt="'.tra('Edit').'" title="'.tra('Edit').'" width="16" height="16" /></a></div><br />'; $ind += strlen($i); while (isset($data[$ind]) && ($data[$ind] == '-' || $data[$ind] == '@')) ++$ind; diff --git a/lib/wiki-plugins/wikiplugin_sql.php b/lib/wiki-plugins/wikiplugin_sql.php index b625731b09b..d17f8d55582 100644 --- a/lib/wiki-plugins/wikiplugin_sql.php +++ b/lib/wiki-plugins/wikiplugin_sql.php @@ -14,7 +14,7 @@ function wikiplugin_sql_info() 'prefs' => array( 'wikiplugin_sql' ), 'body' => tra('The SQL query goes in the body. Example: SELECT column1, column2 FROM table'), 'validate' => 'all', - 'icon' => 'pics/icons/database_table.png', + 'icon' => 'img/icons/database_table.png', 'params' => array( 'db' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_stat.php b/lib/wiki-plugins/wikiplugin_stat.php index a13162ec4c1..c7df2ad0418 100644 --- a/lib/wiki-plugins/wikiplugin_stat.php +++ b/lib/wiki-plugins/wikiplugin_stat.php @@ -12,7 +12,7 @@ function wikiplugin_stat_info() 'documentation' => 'PluginStat', 'description' => tra('Show various statistics for an object'), 'prefs' => array('wikiplugin_stat'), - 'icon' => 'pics/icons/calculator.png', + 'icon' => 'img/icons/calculator.png', 'params' => array( 'type' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_sub.php b/lib/wiki-plugins/wikiplugin_sub.php index 032f08e1598..5c4f37e375d 100644 --- a/lib/wiki-plugins/wikiplugin_sub.php +++ b/lib/wiki-plugins/wikiplugin_sub.php @@ -13,7 +13,7 @@ function wikiplugin_sub_info() 'description' => tra('Apply subscript font to text'), 'prefs' => array( 'wikiplugin_sub' ), 'body' => tra('text'), - 'icon' => 'pics/icons/text_subscript.png', + 'icon' => 'img/icons/text_subscript.png', 'tags' => array( 'basic' ), 'params' => array( ), diff --git a/lib/wiki-plugins/wikiplugin_subscribegroup.php b/lib/wiki-plugins/wikiplugin_subscribegroup.php index 93b4b8d51e0..c7da1bd5326 100644 --- a/lib/wiki-plugins/wikiplugin_subscribegroup.php +++ b/lib/wiki-plugins/wikiplugin_subscribegroup.php @@ -13,7 +13,7 @@ function wikiplugin_subscribegroup_info() 'description' => tra('Allow users to subscribe to a group'), 'prefs' => array( 'wikiplugin_subscribegroup' ), 'body' => tra('text displayed before the button'), - 'icon' => 'pics/icons/group_add.png', + 'icon' => 'img/icons/group_add.png', 'tags' => array( 'basic' ), 'params' => array( 'group' => array( diff --git a/lib/wiki-plugins/wikiplugin_subscribegroups.php b/lib/wiki-plugins/wikiplugin_subscribegroups.php index 936ce28f415..799cd7880b2 100644 --- a/lib/wiki-plugins/wikiplugin_subscribegroups.php +++ b/lib/wiki-plugins/wikiplugin_subscribegroups.php @@ -12,7 +12,7 @@ function wikiplugin_subscribegroups_info() 'documentation' => 'PluginSubscribeGroups', 'description' => tra('Allow users to subscribe to a list of groups'), 'prefs' => array( 'wikiplugin_subscribegroups' ), - 'icon' => 'pics/icons/group_add.png', + 'icon' => 'img/icons/group_add.png', 'params' => array( 'subscribe' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_subscribenewsletter.php b/lib/wiki-plugins/wikiplugin_subscribenewsletter.php index 8e9d5cf93f0..25b1def71ef 100644 --- a/lib/wiki-plugins/wikiplugin_subscribenewsletter.php +++ b/lib/wiki-plugins/wikiplugin_subscribenewsletter.php @@ -13,7 +13,7 @@ function wikiplugin_subscribenewsletter_info() 'description' => tra('Allow users to subscribe to a newsletter'), 'prefs' => array('feature_newsletters', 'wikiplugin_subscribenewsletter'), 'body' => tra('Invitation message'), - 'icon' => 'pics/icons/newspaper_add.png', + 'icon' => 'img/icons/newspaper_add.png', 'tags' => array( 'basic' ), 'params' => array( 'nlId' => array( diff --git a/lib/wiki-plugins/wikiplugin_sup.php b/lib/wiki-plugins/wikiplugin_sup.php index d68d198d98a..5a24830e330 100644 --- a/lib/wiki-plugins/wikiplugin_sup.php +++ b/lib/wiki-plugins/wikiplugin_sup.php @@ -13,7 +13,7 @@ function wikiplugin_sup_info() 'description' => tra('Apply superscript font to text'), 'prefs' => array( 'wikiplugin_sup' ), 'body' => tra('text'), - 'icon' => 'pics/icons/text_superscript.png', + 'icon' => 'img/icons/text_superscript.png', 'filter' => 'wikicontent', 'tags' => array( 'basic' ), 'params' => array( diff --git a/lib/wiki-plugins/wikiplugin_survey.php b/lib/wiki-plugins/wikiplugin_survey.php index a8226368af3..54b372c3d49 100644 --- a/lib/wiki-plugins/wikiplugin_survey.php +++ b/lib/wiki-plugins/wikiplugin_survey.php @@ -13,7 +13,7 @@ function wikiplugin_survey_info() 'description' => tra('Display a survey'), 'prefs' => array( 'feature_surveys', 'wikiplugin_survey' ), 'body' => '', - 'icon' => 'pics/icons/green_question.png', + 'icon' => 'img/icons/green_question.png', 'params' => array( 'id' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_tabs.php b/lib/wiki-plugins/wikiplugin_tabs.php index 316fe64fe3f..a4672082e35 100644 --- a/lib/wiki-plugins/wikiplugin_tabs.php +++ b/lib/wiki-plugins/wikiplugin_tabs.php @@ -13,7 +13,7 @@ function wikiplugin_tabs_info() 'description' => tra('Arrange content in tabs'), 'prefs' => array( 'wikiplugin_tabs' ), 'body' => tra('Tabs content separated by /////'), - 'icon' => 'pics/icons/tab_edit.png', + 'icon' => 'img/icons/tab_edit.png', 'filter' => 'wikicontent', 'tags' => array( 'basic' ), 'params' => array( diff --git a/lib/wiki-plugins/wikiplugin_tag.php b/lib/wiki-plugins/wikiplugin_tag.php index 73b9817ded5..264ff43155d 100644 --- a/lib/wiki-plugins/wikiplugin_tag.php +++ b/lib/wiki-plugins/wikiplugin_tag.php @@ -14,7 +14,7 @@ function wikiplugin_tag_info() 'prefs' => array( 'wikiplugin_tag' ), 'validate' => 'all', 'body' => tra('text'), - 'icon' => 'pics/icons/script_code_red.png', + 'icon' => 'img/icons/script_code_red.png', 'tags' => array( 'basic' ), 'params' => array( 'tag' => array( diff --git a/lib/wiki-plugins/wikiplugin_textlink.php b/lib/wiki-plugins/wikiplugin_textlink.php index 551e904224d..15786d59754 100644 --- a/lib/wiki-plugins/wikiplugin_textlink.php +++ b/lib/wiki-plugins/wikiplugin_textlink.php @@ -12,7 +12,7 @@ function wikiplugin_textlink_info() 'documentation' => 'PluginTextlink', 'description' => tra('Links your article to a site using forwardlink protocol'), 'prefs' => array( 'feature_wiki', 'wikiplugin_textlink', 'feature_forwardlinkprotocol' ), - 'icon' => 'pics/icons/link.png', + 'icon' => 'img/icons/link.png', 'params' => array( 'clipboarddata' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_timeline.php b/lib/wiki-plugins/wikiplugin_timeline.php index 20d9ad88240..7c210eb6ed6 100644 --- a/lib/wiki-plugins/wikiplugin_timeline.php +++ b/lib/wiki-plugins/wikiplugin_timeline.php @@ -13,7 +13,7 @@ function wikiplugin_timeline_info() 'documentation' => 'PluginTimeline', 'description' => tra('Display a timeline'), 'prefs' => array( 'wikiplugin_timeline' ), - 'icon' => 'pics/icons/chart_line.png', + 'icon' => 'img/icons/chart_line.png', 'tags' => array( 'experimental' ), 'params' => array( 'scope' => array( diff --git a/lib/wiki-plugins/wikiplugin_timesheet.php b/lib/wiki-plugins/wikiplugin_timesheet.php index 5873dc852a4..14f68a9e003 100644 --- a/lib/wiki-plugins/wikiplugin_timesheet.php +++ b/lib/wiki-plugins/wikiplugin_timesheet.php @@ -13,7 +13,7 @@ function wikiplugin_timesheet_info() 'description' => tra('A portable timesheet usable in a webpage'), 'prefs' => array('wikiplugin_timesheet', 'feature_time_sheet'), 'body' => tra('text'), - 'icon' => 'pics/icons/layout_header.png', + 'icon' => 'img/icons/layout_header.png', 'tags' => array( 'basic' ), 'params' => array( ), diff --git a/lib/wiki-plugins/wikiplugin_titlesearch.php b/lib/wiki-plugins/wikiplugin_titlesearch.php index 8c45743ba58..41f4ce29e0d 100644 --- a/lib/wiki-plugins/wikiplugin_titlesearch.php +++ b/lib/wiki-plugins/wikiplugin_titlesearch.php @@ -14,7 +14,7 @@ function wikiplugin_titlesearch_info() 'documentation' => 'PluginTitleSearch', 'description' => tra('Search pages by title'), 'prefs' => array( 'feature_wiki', 'wikiplugin_titlesearch' ), - 'icon' => 'pics/icons/page_find.png', + 'icon' => 'img/icons/page_find.png', 'params' => array( 'search' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_toc.php b/lib/wiki-plugins/wikiplugin_toc.php index 16dbe26b05b..08894eb698d 100644 --- a/lib/wiki-plugins/wikiplugin_toc.php +++ b/lib/wiki-plugins/wikiplugin_toc.php @@ -12,7 +12,7 @@ function wikiplugin_toc_info() 'documentation' => 'PluginTOC', 'description' => tra('Display a table of contents of pages or sub-pages'), 'prefs' => array( 'wikiplugin_toc', 'feature_wiki_structure' ), - 'icon' => 'pics/icons/text_list_numbers.png', + 'icon' => 'img/icons/text_list_numbers.png', 'params' => array( 'maxdepth' => array( 'name' => tra('Maximum Depth'), diff --git a/lib/wiki-plugins/wikiplugin_topfriends.php b/lib/wiki-plugins/wikiplugin_topfriends.php index 18771dabae1..2cfaab3ab41 100644 --- a/lib/wiki-plugins/wikiplugin_topfriends.php +++ b/lib/wiki-plugins/wikiplugin_topfriends.php @@ -12,7 +12,7 @@ function wikiplugin_topfriends_info() 'documentation' => 'PluginTopFriends', 'description' => tra('List top-scoring users.'), 'prefs' => array( 'feature_friends', 'wikiplugin_topfriends' ), - 'icon' => 'pics/icons/star.png', + 'icon' => 'img/icons/star.png', 'params' => array( 'limit' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_tr.php b/lib/wiki-plugins/wikiplugin_tr.php index 002c92fbc7b..cc051896434 100644 --- a/lib/wiki-plugins/wikiplugin_tr.php +++ b/lib/wiki-plugins/wikiplugin_tr.php @@ -13,7 +13,7 @@ function wikiplugin_tr_info() 'description' => tra('Translate text to the user language'), 'prefs' => array( 'feature_multilingual', 'wikiplugin_tr' ), 'body' => tra('string'), - 'icon' => 'pics/icons/page_translate_to.png', + 'icon' => 'img/icons/page_translate_to.png', 'params' => array( ), ); diff --git a/lib/wiki-plugins/wikiplugin_tracker.php b/lib/wiki-plugins/wikiplugin_tracker.php index d21c8e96c06..b0525daf418 100644 --- a/lib/wiki-plugins/wikiplugin_tracker.php +++ b/lib/wiki-plugins/wikiplugin_tracker.php @@ -14,7 +14,7 @@ function wikiplugin_tracker_info() 'tags' => array( 'basic' ), 'prefs' => array( 'feature_trackers', 'wikiplugin_tracker' ), 'body' => tra('Confirmation message after posting form'), - 'icon' => 'pics/icons/application_form.png', + 'icon' => 'img/icons/application_form.png', 'params' => array( 'trackerId' => array( 'required' => true, @@ -944,13 +944,13 @@ function wikiplugin_tracker($data, $params) $_REQUEST['error'] = 'y'; } if (isset($field_errors['err_antibot'])) { - $back.= '<div class="simplebox highlight"><img src="pics/icons/exclamation.png" alt=" '.tra('Error').'" style="vertical-align:middle" /> '; + $back.= '<div class="simplebox highlight"><img src="img/icons/exclamation.png" alt=" '.tra('Error').'" style="vertical-align:middle" /> '; $back .= $captchalib->getErrors(); $back.= '</div><br />'; $_REQUEST['error'] = 'y'; } if (isset($field_errors['err_outputwiki'])) { - $back.= '<div class="simplebox highlight"><img src="pics/icons/exclamation.png" alt=" '.tra('Error').'" style="vertical-align:middle" /> '; + $back.= '<div class="simplebox highlight"><img src="img/icons/exclamation.png" alt=" '.tra('Error').'" style="vertical-align:middle" /> '; $back .= $field_errors['err_outputwiki']; $back.= '</div><br />'; $_REQUEST['error'] = 'y'; diff --git a/lib/wiki-plugins/wikiplugin_trackercomments.php b/lib/wiki-plugins/wikiplugin_trackercomments.php index 6876643bd87..b46b3c3b7b0 100644 --- a/lib/wiki-plugins/wikiplugin_trackercomments.php +++ b/lib/wiki-plugins/wikiplugin_trackercomments.php @@ -12,7 +12,7 @@ function wikiplugin_trackercomments_info() 'documentation' => 'PluginTrackerComments', 'description' => tra('Display the number of tracker comments'), 'prefs' => array( 'feature_trackers', 'wikiplugin_trackercomments' ), - 'icon' => 'pics/icons/comments.png', + 'icon' => 'img/icons/comments.png', 'params' => array( 'trackerId' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_trackerif.php b/lib/wiki-plugins/wikiplugin_trackerif.php index 5b69821c4ef..64651a05d2f 100644 --- a/lib/wiki-plugins/wikiplugin_trackerif.php +++ b/lib/wiki-plugins/wikiplugin_trackerif.php @@ -15,7 +15,7 @@ function wikiplugin_trackerif_info() 'documentation' => 'PluginTrackerIf', 'description' => tra('Display content based on results of a tracker field test'), 'prefs' => array( 'wikiplugin_trackerif', 'feature_trackers', 'wikiplugin_tracker' ), // ML: is wikiplugin_tracker necessary? - 'icon' => 'pics/icons/database_table.png', + 'icon' => 'img/icons/database_table.png', 'params' => array( 'test' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_trackeritemfield.php b/lib/wiki-plugins/wikiplugin_trackeritemfield.php index f66f9e8a28e..f69e9e14b43 100644 --- a/lib/wiki-plugins/wikiplugin_trackeritemfield.php +++ b/lib/wiki-plugins/wikiplugin_trackeritemfield.php @@ -13,7 +13,7 @@ function wikiplugin_trackeritemfield_info() 'description' => tra('Display or test the value of a tracker item field'), 'prefs' => array( 'wikiplugin_trackeritemfield', 'feature_trackers' ), 'body' => tra('Wiki text containing an {ELSE} marker.'), - 'icon' => 'pics/icons/database_go.png', + 'icon' => 'img/icons/database_go.png', 'filter' => 'wikicontent', 'params' => array( 'trackerId' => array( diff --git a/lib/wiki-plugins/wikiplugin_trackerlist.php b/lib/wiki-plugins/wikiplugin_trackerlist.php index 2f9f47512e2..ad8a7a9fe3f 100644 --- a/lib/wiki-plugins/wikiplugin_trackerlist.php +++ b/lib/wiki-plugins/wikiplugin_trackerlist.php @@ -15,7 +15,7 @@ function wikiplugin_trackerlist_info() 'tags' => array( 'basic' ), 'body' => tra('Notice'), 'format' => 'html', - 'icon' => 'pics/icons/database_table.png', + 'icon' => 'img/icons/database_table.png', 'filter' => 'text', 'params' => array( 'trackerId' => array( diff --git a/lib/wiki-plugins/wikiplugin_trackerprefill.php b/lib/wiki-plugins/wikiplugin_trackerprefill.php index 6730490d06c..67e820fb481 100644 --- a/lib/wiki-plugins/wikiplugin_trackerprefill.php +++ b/lib/wiki-plugins/wikiplugin_trackerprefill.php @@ -12,7 +12,7 @@ function wikiplugin_trackerprefill_info() 'documentation' => 'PluginTrackerPrefill', 'description' => tra('Create a button to prefill tracker fields'), 'prefs' => array( 'feature_trackers', 'wikiplugin_trackerprefill' ), - 'icon' => 'pics/icons/application_form.png', + 'icon' => 'img/icons/application_form.png', 'params' => array( 'page' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_trackerstat.php b/lib/wiki-plugins/wikiplugin_trackerstat.php index 1fc9dd5e706..d79ff99b48e 100644 --- a/lib/wiki-plugins/wikiplugin_trackerstat.php +++ b/lib/wiki-plugins/wikiplugin_trackerstat.php @@ -13,7 +13,7 @@ function wikiplugin_trackerstat_info() 'description' => tra('Display statistics about a tracker.'), 'prefs' => array( 'feature_trackers', 'wikiplugin_trackerstat' ), 'body' => tra('Title'), - 'icon' => 'pics/icons/calculator.png', + 'icon' => 'img/icons/calculator.png', 'params' => array( 'trackerId' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_trackertimeline.php b/lib/wiki-plugins/wikiplugin_trackertimeline.php index 7b1619664bb..31d890c05a8 100644 --- a/lib/wiki-plugins/wikiplugin_trackertimeline.php +++ b/lib/wiki-plugins/wikiplugin_trackertimeline.php @@ -12,7 +12,7 @@ function wikiplugin_trackertimeline_info() 'documentation' => 'PluginTrackerTimeline', 'description' => tra('Show a timeline view of a tracker'), 'prefs' => array( 'wikiplugin_trackertimeline', 'feature_trackers' ), - 'icon' => 'pics/icons/timeline_marker.png', + 'icon' => 'img/icons/timeline_marker.png', 'params' => array( 'tracker' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_trade.php b/lib/wiki-plugins/wikiplugin_trade.php index aa43a1d9ec9..53ce984e215 100644 --- a/lib/wiki-plugins/wikiplugin_trade.php +++ b/lib/wiki-plugins/wikiplugin_trade.php @@ -15,7 +15,7 @@ function wikiplugin_trade_info() 'description' => tra('Send or receive payments from one member to another. (for cclite only so far, experimental)'), 'validate' => 'all', 'prefs' => array( 'wikiplugin_trade', 'payment_feature' ), - 'icon' => 'pics/icons/money.png', + 'icon' => 'img/icons/money.png', 'tags' => array( 'experimental' ), 'params' => array( 'price' => array( diff --git a/lib/wiki-plugins/wikiplugin_transclude.php b/lib/wiki-plugins/wikiplugin_transclude.php index e669941afda..fa62b988973 100644 --- a/lib/wiki-plugins/wikiplugin_transclude.php +++ b/lib/wiki-plugins/wikiplugin_transclude.php @@ -14,7 +14,7 @@ function wikiplugin_transclude_info() 'prefs' => array('wikiplugin_transclude', 'feature_wiki'), 'extraparams' => true, 'defaultfilter' => 'text', - 'icon' => 'pics/icons/page_copy.png', + 'icon' => 'img/icons/page_copy.png', 'params' => array( 'page' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_translated.php b/lib/wiki-plugins/wikiplugin_translated.php index c6113c87009..8ff112c0c49 100644 --- a/lib/wiki-plugins/wikiplugin_translated.php +++ b/lib/wiki-plugins/wikiplugin_translated.php @@ -13,7 +13,7 @@ function wikiplugin_translated_info() 'description' => tra('Create multi-lingual links'), 'prefs' => array( 'feature_multilingual', 'wikiplugin_translated' ), 'body' => tra('[url] or ((wikiname)) or ((inter:interwiki)) (use wiki syntax)'), - 'icon' => 'pics/icons/world_link.png', + 'icon' => 'img/icons/world_link.png', 'params' => array( 'lang' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_twitter.php b/lib/wiki-plugins/wikiplugin_twitter.php index b271e2ffa26..e7589bb4e79 100644 --- a/lib/wiki-plugins/wikiplugin_twitter.php +++ b/lib/wiki-plugins/wikiplugin_twitter.php @@ -13,7 +13,7 @@ function wikiplugin_twitter_info() 'description' => tra('Display the activity for a twitter account'), 'prefs' => array('wikiplugin_twitter'), 'body' => '', - 'icon' => 'pics/icons/twitter.png', + 'icon' => 'img/icons/twitter.png', 'params' => array( 'tweet' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_usercount.php b/lib/wiki-plugins/wikiplugin_usercount.php index b269008b915..b6717f5ed2e 100644 --- a/lib/wiki-plugins/wikiplugin_usercount.php +++ b/lib/wiki-plugins/wikiplugin_usercount.php @@ -13,7 +13,7 @@ function wikiplugin_usercount_info() 'description' => tra('Display number of users for a site or group'), 'prefs' => array( 'wikiplugin_usercount' ), 'body' => tra('Group name'), - 'icon' => 'pics/icons/group_gear.png', + 'icon' => 'img/icons/group_gear.png', 'params' => array( ), ); diff --git a/lib/wiki-plugins/wikiplugin_userlink.php b/lib/wiki-plugins/wikiplugin_userlink.php index 3e8fc26f0ca..90eb8408d8d 100644 --- a/lib/wiki-plugins/wikiplugin_userlink.php +++ b/lib/wiki-plugins/wikiplugin_userlink.php @@ -12,7 +12,7 @@ function wikiplugin_userlink_info() 'documentation' => 'PluginUserlink', 'description' => tra('Display a link to a user\'s information page'), 'prefs' => array('wikiplugin_userlink'), - 'icon' => 'pics/icons/user_go.png', + 'icon' => 'img/icons/user_go.png', 'params' => array( 'user' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_userlist.php b/lib/wiki-plugins/wikiplugin_userlist.php index 294ba23def5..53398b404ea 100644 --- a/lib/wiki-plugins/wikiplugin_userlist.php +++ b/lib/wiki-plugins/wikiplugin_userlist.php @@ -13,7 +13,7 @@ function wikiplugin_userlist_info() 'description' => tra('Display a list of registered users'), 'prefs' => array( 'wikiplugin_userlist' ), 'body' => tra('Login Filter'), - 'icon' => 'pics/icons/group_go.png', + 'icon' => 'img/icons/group_go.png', 'params' => array( 'sep' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_userpref.php b/lib/wiki-plugins/wikiplugin_userpref.php index e13116b3dbd..39128fa1ad7 100644 --- a/lib/wiki-plugins/wikiplugin_userpref.php +++ b/lib/wiki-plugins/wikiplugin_userpref.php @@ -15,7 +15,7 @@ function wikiplugin_userpref_info() 'prefs' => array('wikiplugin_userpref'), 'filter' => 'wikicontent', 'extraparams' => true, - 'icon' => 'pics/icons/user.png', + 'icon' => 'img/icons/user.png', 'params' => array( ), ); diff --git a/lib/wiki-plugins/wikiplugin_versions.php b/lib/wiki-plugins/wikiplugin_versions.php index 523f4bb7bae..47c83dd2eab 100644 --- a/lib/wiki-plugins/wikiplugin_versions.php +++ b/lib/wiki-plugins/wikiplugin_versions.php @@ -13,7 +13,7 @@ function wikiplugin_versions_info() 'description' => tra('Create tabs for showing alternate versions of content'), 'prefs' => array( 'wikiplugin_versions' ), 'body' => tra('Block of text separated by ---(version x)--- markers. Text before the first marker is used by default.'), - 'icon' => 'pics/icons/tab_edit.png', + 'icon' => 'img/icons/tab_edit.png', 'tags' => array( 'basic' ), 'params' => array( 'nav' => array( diff --git a/lib/wiki-plugins/wikiplugin_vimeo.php b/lib/wiki-plugins/wikiplugin_vimeo.php index b40f7c104b9..1b269e618e1 100644 --- a/lib/wiki-plugins/wikiplugin_vimeo.php +++ b/lib/wiki-plugins/wikiplugin_vimeo.php @@ -14,7 +14,7 @@ function wikiplugin_vimeo_info() 'documentation' => 'PluginVimeo', 'description' => tra('Display a Vimeo video'), 'prefs' => array( 'wikiplugin_vimeo' ), - 'icon' => 'pics/icons/vimeo.png', + 'icon' => 'img/icons/vimeo.png', 'introduced' => 6.1, 'params' => array( 'url' => array( diff --git a/lib/wiki-plugins/wikiplugin_vote.php b/lib/wiki-plugins/wikiplugin_vote.php index 0f0a5d6a93f..e56d9addb39 100644 --- a/lib/wiki-plugins/wikiplugin_vote.php +++ b/lib/wiki-plugins/wikiplugin_vote.php @@ -13,7 +13,7 @@ function wikiplugin_vote_info() 'description' => tra('Create a tracker for voting'), 'prefs' => array( 'feature_trackers', 'wikiplugin_vote' ), 'body' => tra('Title'), - 'icon' => 'pics/icons/thumb_up.png', + 'icon' => 'img/icons/thumb_up.png', 'params' => array( 'trackerId' => array( 'required' => true, diff --git a/lib/wiki-plugins/wikiplugin_wantedpages.php b/lib/wiki-plugins/wikiplugin_wantedpages.php index 53ecae02087..17167d06bf0 100644 --- a/lib/wiki-plugins/wikiplugin_wantedpages.php +++ b/lib/wiki-plugins/wikiplugin_wantedpages.php @@ -15,7 +15,7 @@ function wikiplugin_wantedpages_info() 'description' => tra('Show location of links to pages not yet created'), 'prefs' => array( 'wikiplugin_wantedpages' ), 'body' => tra('Custom level regex. A custom filter for wanted pages to be listed (only used when level=>custom). Possible values: a valid regex-expression (PCRE).'), - 'icon' => 'pics/icons/page_white_find.png', + 'icon' => 'img/icons/page_white_find.png', 'tags' => array( 'basic' ), 'params' => array( 'ignore' => array( diff --git a/lib/wiki-plugins/wikiplugin_watershed.php b/lib/wiki-plugins/wikiplugin_watershed.php index ddf8d415d82..8a5e9fb23bb 100644 --- a/lib/wiki-plugins/wikiplugin_watershed.php +++ b/lib/wiki-plugins/wikiplugin_watershed.php @@ -13,7 +13,7 @@ function wikiplugin_watershed_info() 'description' => tra('Viewer for UStream Watershed Embed.'), 'format' => 'html', 'prefs' => array( 'wikiplugin_watershed', 'feature_watershed' ), - 'icon' => 'pics/icons/transmit_blue.png', + 'icon' => 'img/icons/transmit_blue.png', 'params' => array( 'type' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_webservice.php b/lib/wiki-plugins/wikiplugin_webservice.php index df4e2ba7303..67061350368 100644 --- a/lib/wiki-plugins/wikiplugin_webservice.php +++ b/lib/wiki-plugins/wikiplugin_webservice.php @@ -14,7 +14,7 @@ function wikiplugin_webservice_info() 'prefs' => array( 'wikiplugin_webservice' ), 'body' => tra('Template to apply to the data provided. Template format uses smarty templating engine using double brackets as delimiter. Output must provide wiki syntax. Body can be sent to a parameter instead by using the bodyname parameter.'), 'validate' => 'all', - 'icon' => 'pics/icons/world_go.png', + 'icon' => 'img/icons/world_go.png', 'params' => array( 'url' => array( 'required' => false, diff --git a/lib/wiki-plugins/wikiplugin_youtube.php b/lib/wiki-plugins/wikiplugin_youtube.php index e9e838460e5..7413f489269 100644 --- a/lib/wiki-plugins/wikiplugin_youtube.php +++ b/lib/wiki-plugins/wikiplugin_youtube.php @@ -12,7 +12,7 @@ function wikiplugin_youtube_info() 'documentation' => 'PluginYouTube', 'description' => tra('Display a YouTube video'), 'prefs' => array( 'wikiplugin_youtube' ), - 'icon' => 'pics/icons/youtube.png', + 'icon' => 'img/icons/youtube.png', 'tags' => array( 'basic' ), 'params' => array( 'movie' => array( diff --git a/styles/layout/design.css b/styles/layout/design.css index 6c1ef8f601c..e16caa0eaf3 100644 --- a/styles/layout/design.css +++ b/styles/layout/design.css @@ -50,7 +50,7 @@ body.wikitext { /* Autosave Preview handle */ #autosave_preview_grippy { background-color: #ccc; - background-image: url("../../pics/icons/shading.png"); + background-image: url("../../img/icons/shading.png"); } /* allow disabled elements to show up - FIXME @@ -1355,32 +1355,32 @@ textarea.tshoutbox{ .fancysort th.headerSortUp { background-repeat: no-repeat; background-position: right; - background-image: url(../../pics/icons/resultset_up.png) !important; + background-image: url(../../img/icons/resultset_up.png) !important; } .fancysort th.headerSortDown { background-repeat: no-repeat; background-position: right; - background-image: url(../../pics/icons/resultset_down.png) !important; + background-image: url(../../img/icons/resultset_down.png) !important; } .fancysort th.header { background-repeat: no-repeat; background-position: right; - background-image: url(../../pics/icons/resultset.png); + background-image: url(../../img/icons/resultset.png); } /* jq tracker header */ .trackerHeaderOpen { background-repeat: no-repeat; background-position: right; - background-image: url(../../pics/icons/resultset_down.png); + background-image: url(../../img/icons/resultset_down.png); } .trackerHeaderClose { background-repeat: no-repeat; background-position: right; - background-image: url(../../pics/icons/resultset_next.png); + background-image: url(../../img/icons/resultset_next.png); } /* Perspectives (edit) */ @@ -1513,7 +1513,7 @@ textarea.tshoutbox{ /* jquery validation */ label.error { - background : url('../../pics/icons/error.png') no-repeat; + background : url('../../img/icons/error.png') no-repeat; color:red; padding-left:20px; margin-left: 0.5em; diff --git a/styles/layout/layout.css b/styles/layout/layout.css index 316b5527fde..13054dd0bc8 100644 --- a/styles/layout/layout.css +++ b/styles/layout/layout.css @@ -356,12 +356,12 @@ li#logout_link a { #col2 .moduleflip-vert .flipmodimage, .minimize-modules-right #col3 .moduleflip-vert .flipmodimage { - background-image: url(../../pics/icons/resultset_first.png) !important; + background-image: url(../../img/icons/resultset_first.png) !important; } #col3 .moduleflip-vert .flipmodimage, .minimize-modules-left #col2 .moduleflip-vert .flipmodimage { - background-image: url(../../pics/icons/resultset_last.png) !important; + background-image: url(../../img/icons/resultset_last.png) !important; } .minimize-modules-left #col2 .separator, diff --git a/templates/admin/include_profiles.tpl b/templates/admin/include_profiles.tpl index 59f039bc2dd..e0f4d198844 100644 --- a/templates/admin/include_profiles.tpl +++ b/templates/admin/include_profiles.tpl @@ -376,7 +376,7 @@ $("#repository, #categories").change(function(){ <tr> <td>{$entry.short}</td> <td><img id="profile-status-{$k}" alt="{tr}Status{/tr}" src="img/icons/status_{$entry.status}.gif"/></td> - <td><span id="profile-date-{$k}">{$entry.formatted}</span> <a href="javascript:refreshCache({$k})" class="icon"><img src="pics/icons/arrow_refresh.png" class="icon" alt="{tr}Refresh{/tr}"/></a></td> + <td><span id="profile-date-{$k}">{$entry.formatted}</span> <a href="javascript:refreshCache({$k})" class="icon"><img src="img/icons/arrow_refresh.png" class="icon" alt="{tr}Refresh{/tr}"/></a></td> </tr> {/foreach} </table> diff --git a/templates/map/tiki-map.tpl b/templates/map/tiki-map.tpl index d03b4a9e2e4..384ed787e3a 100644 --- a/templates/map/tiki-map.tpl +++ b/templates/map/tiki-map.tpl @@ -158,11 +158,11 @@ </select> <input type="submit" name="Go" value="{tr}Go{/tr}" /> {/if} - <input type="image" name="maponly" value="yes" src="pics/icons/image.png" alt="{tr}View the Map Only{/tr}" title="{tr}View the Map Only{/tr}" /> + <input type="image" name="maponly" value="yes" src="img/icons/image.png" alt="{tr}View the Map Only{/tr}" title="{tr}View the Map Only{/tr}" /> {if $tiki_p_map_edit eq 'y'} <a class="link" href="tiki-map_edit.php?mapfile={$mapfile}&mode=editing"> - <img src="pics/icons/wrench.png" alt="{tr}Edit{/tr}" title="{tr}Edit{/tr}" width="16" height="16" /></a> + <img src="img/icons/wrench.png" alt="{tr}Edit{/tr}" title="{tr}Edit{/tr}" width="16" height="16" /></a> {/if} <a href="tiki-map.php?mapfile={$mapfile}" ><small>{tr}Reset Map{/tr}</small></a><br /> @@ -205,7 +205,7 @@ <img src="img/icons/edit.gif" alt="{tr}Label{/tr}" title="{tr}Label{/tr}" /></th> <th> <img src="img/icons/question.gif" alt="{tr}Query{/tr}" title="{tr}Query{/tr}" /></th> - <th><img src="pics/icons/disk.png" width="16" height="16" alt="{tr}Download{/tr}" title="{tr}Download{/tr}" /></th> + <th><img src="img/icons/disk.png" width="16" height="16" alt="{tr}Download{/tr}" title="{tr}Download{/tr}" /></th> </tr> {section name=j loop=$my_layers} {if $my_layers[j]->group neq ""} @@ -276,7 +276,7 @@ {if $layer_download[i] eq "T"} <small> <a href="tiki-map_download.phtml?mapfile={$mapfile}&layer={$my_layers[i]->name}"> - <img src="pics/icons/disk.png" alt="{tr}Download{/tr}" title="{tr}Download{/tr}" width="16" height="16" /></a> + <img src="img/icons/disk.png" alt="{tr}Download{/tr}" title="{tr}Download{/tr}" width="16" height="16" /></a> </small> {/if} </td> @@ -335,7 +335,7 @@ {if $layer_download[j] eq "T"} <small> <a href="tiki-map_download.phtml?mapfile={$mapfile}&layer={$my_layers[j]->name}"> - <img src="pics/icons/disk.png" alt="{tr}Download{/tr}" title="{tr}Download{/tr}" width="16" height="16" /></a> + <img src="img/icons/disk.png" alt="{tr}Download{/tr}" title="{tr}Download{/tr}" width="16" height="16" /></a> </small> {/if} </td> diff --git a/templates/map/tiki-map_edit.tpl b/templates/map/tiki-map_edit.tpl index 79172e5fb29..f9fcb0a1ae0 100644 --- a/templates/map/tiki-map_edit.tpl +++ b/templates/map/tiki-map_edit.tpl @@ -21,14 +21,14 @@ <td class="odd"> {if $tiki_p_map_edit eq 'y'} <a class="link" href="tiki-map_edit.php?mapfile={$files[user]}&mode=editing"> -<img src="pics/icons/wrench.png" alt="{tr}Edit{/tr}" title="{tr}Edit{/tr}" width='16' height='16' /> +<img src="img/icons/wrench.png" alt="{tr}Edit{/tr}" title="{tr}Edit{/tr}" width='16' height='16' /> </a> {/if} {if $user and $prefs.feature_user_watches eq 'y'} {if $user_watching_map[user] eq 'n'} - <a href="tiki-map_edit.php?watch_event=map_changed&watch_object={$files[user]}&watch_action=add" class="icon"><img class="icon" alt="{tr}monitor this map{/tr}" title="{tr}monitor this map{/tr}" src='pics/icons/eye.png' width='16' height='16' /></a> + <a href="tiki-map_edit.php?watch_event=map_changed&watch_object={$files[user]}&watch_action=add" class="icon"><img class="icon" alt="{tr}monitor this map{/tr}" title="{tr}monitor this map{/tr}" src='img/icons/eye.png' width='16' height='16' /></a> {else} - <a class="icon" href="tiki-map_edit.php?watch_event=map_changed&watch_object={$files[user]}&watch_action=remove"><img class="icon" alt="{tr}Stop Monitoring this Map{/tr}" title="{tr}Stop Monitoring this Map{/tr}" src='pics/icons/no_eye.png' width='16' height='16' /></a> + <a class="icon" href="tiki-map_edit.php?watch_event=map_changed&watch_object={$files[user]}&watch_action=remove"><img class="icon" alt="{tr}Stop Monitoring this Map{/tr}" title="{tr}Stop Monitoring this Map{/tr}" src='img/icons/no_eye.png' width='16' height='16' /></a> {/if} {/if} </td> @@ -47,14 +47,14 @@ <td class="even"> {if $tiki_p_map_edit eq 'y'} <a class="link" href="tiki-map_edit.php?mapfile={$files[user]}&mode=editing"> -<img src="pics/icons/wrench.png" alt="{tr}Edit{/tr}" title="{tr}Edit{/tr}" width='16' height='16' /> +<img src="img/icons/wrench.png" alt="{tr}Edit{/tr}" title="{tr}Edit{/tr}" width='16' height='16' /> </a> {/if} {if $user and $prefs.feature_user_watches eq 'y'} {if $user_watching_map[user] eq 'n'} - <a class="icon" href="tiki-map_edit.php?watch_event=map_changed&watch_object={$files[user]}&watch_action=add"><img class="icon" alt="{tr}monitor this map{/tr}" title="{tr}monitor this map{/tr}" src='pics/icons/eye.png' width='16' height='16' /></a> + <a class="icon" href="tiki-map_edit.php?watch_event=map_changed&watch_object={$files[user]}&watch_action=add"><img class="icon" alt="{tr}monitor this map{/tr}" title="{tr}monitor this map{/tr}" src='img/icons/eye.png' width='16' height='16' /></a> {else} - <a class="icon" href="tiki-map_edit.php?watch_event=map_changed&watch_object={$files[user]}&watch_action=remove"><img class="icon" alt="{tr}Stop Monitoring this Map{/tr}" title="{tr}Stop Monitoring this Map{/tr}" src='pics/icons/no_eye.png' width='16' height='16' /></a> + <a class="icon" href="tiki-map_edit.php?watch_event=map_changed&watch_object={$files[user]}&watch_action=remove"><img class="icon" alt="{tr}Stop Monitoring this Map{/tr}" title="{tr}Stop Monitoring this Map{/tr}" src='img/icons/no_eye.png' width='16' height='16' /></a> {/if} {/if} </td> diff --git a/templates/map/tiki-map_frame.tpl b/templates/map/tiki-map_frame.tpl index a2c1220fb15..3d1d6e33be1 100644 --- a/templates/map/tiki-map_frame.tpl +++ b/templates/map/tiki-map_frame.tpl @@ -24,9 +24,9 @@ <img id="imgzoom2" src="img/icons/zoom-2.gif" onclick="zoomin(0)" alt="-x2" title="{tr}Zoom out x2{/tr}" /> {/if} {if $zoom eq 0} - <img id="imgzoom3" src="pics/icons/shape_square_edit.png" onclick="zoomin(1)" alt="Q" title="{tr}Query{/tr}" border="1" /> + <img id="imgzoom3" src="img/icons/shape_square_edit.png" onclick="zoomin(1)" alt="Q" title="{tr}Query{/tr}" border="1" /> {else} - <img id="imgzoom3" src="pics/icons/shape_square_edit.png" onclick="zoomin(1)" alt="Q" title="{tr}Query{/tr}" /> + <img id="imgzoom3" src="img/icons/shape_square_edit.png" onclick="zoomin(1)" alt="Q" title="{tr}Query{/tr}" /> {/if} {if $zoom eq 1} <img id="imgzoom4" src="img/icons/move.gif" onclick="zoomin(2)" alt="P" title="{tr}Pan{/tr}" border="1" /> diff --git a/templates/map/tiki-map_upload.tpl b/templates/map/tiki-map_upload.tpl index 35d5bf7c38d..16236a3e976 100644 --- a/templates/map/tiki-map_upload.tpl +++ b/templates/map/tiki-map_upload.tpl @@ -23,7 +23,7 @@ <td class="odd"> {if $tiki_p_map_delete eq 'y'} <a class="link" href="tiki-map_upload.php?dir={$dir}&directory={$dirs[user]}&action=deldir"> -<img src='pics/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" width='16' height='16' /> +<img src='img/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" width='16' height='16' /> </a> {/if} </td> @@ -38,7 +38,7 @@ <td class="even"> {if $tiki_p_map_delete eq 'y'} <a class="link" href="tiki-map_upload.php?dir={$dir}&directory={$dirs[user]}&action=deldir"> -<img src='pics/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" width='16' height='16' /> +<img src='img/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" width='16' height='16' /> </a> {/if} </td> @@ -55,7 +55,7 @@ <td class="{cycle advance=true}"> {if $tiki_p_map_delete eq 'y'} <a class="link" href="tiki-map_upload.php?dir={$dir}&file={$files[user]}&action=delete"> -<img src='pics/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" width='16' height='16' /> +<img src='img/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" width='16' height='16' /> </a> {/if} </td> diff --git a/templates/modules/mod-assistant.tpl b/templates/modules/mod-assistant.tpl index 8dc7132ed55..c9f45a77100 100644 --- a/templates/modules/mod-assistant.tpl +++ b/templates/modules/mod-assistant.tpl @@ -5,7 +5,7 @@ </div> {if $tiki_p_admin eq 'y'} <p> - <img src="pics/icons/arrow_small.png" alt="" style="border:0;margin-right:2px;vertical-align:middle" align="left" /> + <img src="img/icons/arrow_small.png" alt="" style="border:0;margin-right:2px;vertical-align:middle" align="left" /> <strong>{tr}To configure your Tiki{/tr}</strong>:<br /> {tr}Select{/tr} <a class="link" href="tiki-admin.php" title="{tr}Admin Home{/tr}">{tr}Admin{/tr} > {tr}Admin Home{/tr}</a> {tr}from the menu{/tr}. </p> @@ -16,25 +16,25 @@ {tr}Watch the <a class="link" href="http://tiki.org/TikiMovies" title="Demos" target="_blank">demo movies{/tr}</a>. </p> <p> - <img src="pics/icons/arrow_small.png" alt="" style="border:0;margin-right:2px;vertical-align:middle" align="left" /> + <img src="img/icons/arrow_small.png" alt="" style="border:0;margin-right:2px;vertical-align:middle" align="left" /> <strong>{tr}To remove this module{/tr}</strong>:<br /> {tr}Select{/tr} <a class="link" href="tiki-admin_modules.php#leftmod" title="{tr}Admin Modules{/tr}">{tr}Admin{/tr} > {tr}Modules{/tr}</a> {tr}and remove the assistant module{/tr}. {tr}You can also add other modules{/tr}. </p> <p> - <img src="pics/icons/arrow_small.png" alt="" style="border:0;margin-right:2px;vertical-align:middle" align="left" /> + <img src="img/icons/arrow_small.png" alt="" style="border:0;margin-right:2px;vertical-align:middle" align="left" /> <strong>{tr}To customize the menu{/tr}</strong>:<br /> {tr}Select{/tr} <a class="link" href="tiki-admin_menus.php" title="{tr}Admin Menus{/tr}">{tr}Admin{/tr} > {tr}Menus{/tr}</a> {tr}and edit menu ID 42{/tr}.<br />{tr}Or, create your own menu and add it to a module{/tr}. </p> <hr /> {else} <p> - <a href="tiki-login.php" title="{tr}Login{/tr}"><img src="pics/icons/accept.png" alt="{tr}Login{/tr}" style="border:0;margin-right:2px;vertical-align:middle" align="left" /></a>{tr}To begin configuring Tiki, please{/tr} <a href="tiki-login.php" title="{tr}Login{/tr}">{tr}login{/tr}</a> {tr}as admin{/tr}. + <a href="tiki-login.php" title="{tr}Login{/tr}"><img src="img/icons/accept.png" alt="{tr}Login{/tr}" style="border:0;margin-right:2px;vertical-align:middle" align="left" /></a>{tr}To begin configuring Tiki, please{/tr} <a href="tiki-login.php" title="{tr}Login{/tr}">{tr}login{/tr}</a> {tr}as admin{/tr}. </p> {/if} <p> <a href="http://tiki.org" title="{tr}The Tiki Community{/tr}" target="_blank"><img src="favicon.png" alt="{tr}The Tiki Community{/tr}" style="border:0;margin-right:2px;vertical-align:middle" align="left" /></a>{tr}To learn more, visit: <a href="http://tiki.org" title="The Tiki Community" target="_blank">http://tiki.org</a>{/tr}. </p> <p> - <a href="http://doc.tiki.org" title="{tr}Tiki Documentation{/tr}" target="_blank"><img src="pics/icons/help.png" alt="{tr}Tiki Documentation{/tr}" style="border:0px;margin-right:2px;vertical-align:middle" align="left" /></a>{tr}For help, visit <a href="http://doc.tiki.org" title="Tiki Documentation" target="_blank">http://doc.tiki.org</a>{/tr}. + <a href="http://doc.tiki.org" title="{tr}Tiki Documentation{/tr}" target="_blank"><img src="img/icons/help.png" alt="{tr}Tiki Documentation{/tr}" style="border:0px;margin-right:2px;vertical-align:middle" align="left" /></a>{tr}For help, visit <a href="http://doc.tiki.org" title="Tiki Documentation" target="_blank">http://doc.tiki.org</a>{/tr}. </p> {/tikimodule} diff --git a/templates/modules/mod-calendar_new.tpl b/templates/modules/mod-calendar_new.tpl index 1ca3411c109..0f5218339e3 100644 --- a/templates/modules/mod-calendar_new.tpl +++ b/templates/modules/mod-calendar_new.tpl @@ -71,7 +71,7 @@ </table> {/if} {if $tiki_p_add_events eq 'y' && (empty($module_params.showaction) || $module_params.showaction ne 'n')} - <p><a href="tiki-calendar_edit_item.php"><img src="pics/icons/add.png" alt="" /> {tr}Add event{/tr}</a></p> + <p><a href="tiki-calendar_edit_item.php"><img src="img/icons/add.png" alt="" /> {tr}Add event{/tr}</a></p> {/if} {/tikimodule} {/if} diff --git a/templates/modules/mod-rsslist.tpl b/templates/modules/mod-rsslist.tpl index ee773ce8861..a19ed45fe3f 100644 --- a/templates/modules/mod-rsslist.tpl +++ b/templates/modules/mod-rsslist.tpl @@ -1,55 +1,55 @@ {tikimodule error=$module_params.error title=$tpl_module_title name="rsslist" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle} <div id="rss"> {if $prefs.feature_wiki eq 'y' and $prefs.feed_wiki eq 'y' and $tiki_p_view eq 'y'} - <a class="linkmodule" title="{tr}Wiki feed{/tr}" href="tiki-wiki_rss.php?ver={$prefs.feed_default_version}"><img src='pics/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> + <a class="linkmodule" title="{tr}Wiki feed{/tr}" href="tiki-wiki_rss.php?ver={$prefs.feed_default_version}"><img src='img/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> {tr}Wiki{/tr} </a> <br /> {/if} {if $prefs.feature_blogs eq 'y' and $prefs.feed_blogs eq 'y' and $tiki_p_read_blog eq 'y'} - <a class="linkmodule" title="{tr}Blogs feed{/tr}" href="tiki-blogs_rss.php?ver={$prefs.feed_default_version}"><img src='pics/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> + <a class="linkmodule" title="{tr}Blogs feed{/tr}" href="tiki-blogs_rss.php?ver={$prefs.feed_default_version}"><img src='img/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> {tr}Blogs{/tr} </a> <br /> {/if} {if $prefs.feature_articles eq 'y' and $prefs.feed_articles eq 'y' and $tiki_p_read_article eq 'y'} - <a class="linkmodule" title="{tr}Articles feed{/tr}" href="tiki-articles_rss.php?ver={$prefs.feed_default_version}"><img src='pics/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> + <a class="linkmodule" title="{tr}Articles feed{/tr}" href="tiki-articles_rss.php?ver={$prefs.feed_default_version}"><img src='img/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> {tr}Articles{/tr} </a> <br /> {/if} {if $prefs.feature_galleries eq 'y' and $prefs.feed_image_galleries eq 'y' and $tiki_p_view_image_gallery eq 'y'} - <a class="linkmodule" title="{tr}Image Galleries feed{/tr}" href="tiki-image_galleries_rss.php?ver={$prefs.feed_default_version}"><img src='pics/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> + <a class="linkmodule" title="{tr}Image Galleries feed{/tr}" href="tiki-image_galleries_rss.php?ver={$prefs.feed_default_version}"><img src='img/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> {tr}Image Galleries{/tr} </a> <br /> {/if} {if $prefs.feature_file_galleries eq 'y' and $prefs.feed_file_galleries eq 'y' and $tiki_p_view_file_gallery eq 'y'} - <a class="linkmodule" title="{tr}File Galleries feed{/tr}" href="tiki-file_galleries_rss.php?ver={$prefs.feed_default_version}"><img src='pics/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> + <a class="linkmodule" title="{tr}File Galleries feed{/tr}" href="tiki-file_galleries_rss.php?ver={$prefs.feed_default_version}"><img src='img/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> {tr}File Galleries{/tr} </a> <br /> {/if} {if $prefs.feature_forums eq 'y' and $prefs.feed_forums eq 'y' and $tiki_p_forum_read eq 'y'} - <a class="linkmodule" title="{tr}Forums feed{/tr}" href="tiki-forums_rss.php?ver={$prefs.feed_default_version}"><img src='pics/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> + <a class="linkmodule" title="{tr}Forums feed{/tr}" href="tiki-forums_rss.php?ver={$prefs.feed_default_version}"><img src='img/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> {tr}Forums{/tr} </a> <br /> {/if} {if $prefs.feature_maps eq 'y' and $prefs.rss_mapfiles eq 'y' and $tiki_p_map_view eq 'y'} - <a class="linkmodule" title="{tr}Maps feed{/tr}" href="tiki-map_rss.php?ver={$prefs.feed_default_version}"><img src='pics/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> + <a class="linkmodule" title="{tr}Maps feed{/tr}" href="tiki-map_rss.php?ver={$prefs.feed_default_version}"><img src='img/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> {tr}Maps{/tr} </a> <br /> {/if} {if $prefs.feature_directory eq 'y' and $prefs.feed_directories eq 'y' and $tiki_p_view_directory eq 'y'} - <a class="linkmodule" href="tiki-directories_rss.php?ver={$prefs.feed_default_version}"><img src='pics/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> + <a class="linkmodule" href="tiki-directories_rss.php?ver={$prefs.feed_default_version}"><img src='img/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> {tr}Directories{/tr} </a> <br /> {/if} {if $prefs.feature_calendar eq 'y' and $prefs.feed_calendar eq 'y' and $tiki_p_view_calendar eq 'y'} - <a class="linkmodule" href="tiki-calendars_rss.php?ver={$prefs.feed_default_version}"><img src='pics/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> + <a class="linkmodule" href="tiki-calendars_rss.php?ver={$prefs.feed_default_version}"><img src='img/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' /> {tr}Calendars{/tr} </a> <br /> diff --git a/templates/modules/mod-upcoming_events.tpl b/templates/modules/mod-upcoming_events.tpl index 5b9f15a2403..76af9a78573 100644 --- a/templates/modules/mod-upcoming_events.tpl +++ b/templates/modules/mod-upcoming_events.tpl @@ -45,6 +45,6 @@ {/if} {if $tiki_p_add_events eq 'y' && (empty($module_params.showaction) || $module_params.showaction ne 'n')} - <p><a href="tiki-calendar_edit_item.php"><img src="pics/icons/add.png" alt="" /> {tr}Add Event{/tr}</a></p> + <p><a href="tiki-calendar_edit_item.php"><img src="img/icons/add.png" alt="" /> {tr}Add Event{/tr}</a></p> {/if} {/tikimodule} diff --git a/templates/tiki-admin_menu_options.tpl b/templates/tiki-admin_menu_options.tpl index c6561afbbee..a9bffc433c5 100644 --- a/templates/tiki-admin_menu_options.tpl +++ b/templates/tiki-admin_menu_options.tpl @@ -355,7 +355,7 @@ {if $channels} <div align="left"> {tr}Perform action with checked:{/tr} - <input type="image" name="delsel" src='pics/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" /> + <input type="image" name="delsel" src='img/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" /> </div> {/if} </form> diff --git a/templates/tiki-admin_menus.tpl b/templates/tiki-admin_menus.tpl index 42a3b85d8ab..38629c93ab8 100644 --- a/templates/tiki-admin_menus.tpl +++ b/templates/tiki-admin_menus.tpl @@ -110,9 +110,9 @@ {remarksbox type="tip" title="{tr}Note{/tr}"} {tr}To use custom folder icons in menus, enter the path to the icon for the <strong>closed</strong> folder.{/tr} {tr}In the same directory, include an icon for the opened folder.{/tr} {tr}The "opened folder" icon name must be identical to the "closed folder" icon name, prefixed with the letter <strong>o</strong>.{/tr} <hr /> - {tr}For example, the default icon is: pics/icons/folder.png{/tr} {icon _id="folder"} + {tr}For example, the default icon is: img/icons/folder.png{/tr} {icon _id="folder"} <br /> - {tr}The name of the "open folder" icon is: pics/icons/ofolder.png{/tr} {icon _id="ofolder"} + {tr}The name of the "open folder" icon is: img/icons/ofolder.png{/tr} {icon _id="ofolder"} {/remarksbox} </td> </tr> diff --git a/templates/tiki-admin_metrics.tpl b/templates/tiki-admin_metrics.tpl index 3f7a098e8cf..7b572a7189f 100644 --- a/templates/tiki-admin_metrics.tpl +++ b/templates/tiki-admin_metrics.tpl @@ -29,9 +29,9 @@ <td class="text">{$metric.metric_datatype|escape}</td> <td class="text">{$metric.metric_query|escape}</td> <td class="action"> - <a class="link" href="tiki-admin_metrics.php?metric_edit={$i|escape:'url'}#editcreate" title="{tr}Edit{/tr}"><img src="pics/icons/page_edit.png" width="16" height="16" alt="{tr}Edit{/tr}" /></a> - <a class="link" href="tiki-admin_metrics.php?assign_metric_new={$i|escape:'url'}#assign" title="{tr}Assign{/tr}"><img src="pics/icons/accept.png" width="16" height="16" alt="{tr}Assign{/tr}" /></a> - <a class="link" href="tiki-admin_metrics.php?metric_remove={$i|escape:'url'}" title="{tr}Delete{/tr}"><img src="pics/icons/cross.png" width="16" height="16" alt="{tr}Delete{/tr}" /></a> + <a class="link" href="tiki-admin_metrics.php?metric_edit={$i|escape:'url'}#editcreate" title="{tr}Edit{/tr}"><img src="img/icons/page_edit.png" width="16" height="16" alt="{tr}Edit{/tr}" /></a> + <a class="link" href="tiki-admin_metrics.php?assign_metric_new={$i|escape:'url'}#assign" title="{tr}Assign{/tr}"><img src="img/icons/accept.png" width="16" height="16" alt="{tr}Assign{/tr}" /></a> + <a class="link" href="tiki-admin_metrics.php?metric_remove={$i|escape:'url'}" title="{tr}Delete{/tr}"><img src="img/icons/cross.png" width="16" height="16" alt="{tr}Delete{/tr}" /></a> </td> </tr> {/foreach} @@ -54,8 +54,8 @@ <td class="text">{$tab.tab_name|escape}</td> <td class="integer">{$tab.tab_order|escape}</td> <td class="action"> - <a class="link" href="tiki-admin_metrics.php?tab_edit={$i|escape:'url'}#editcreatetab" title="{tr}Edit{/tr}"><img src="pics/icons/page_edit.png" width="16" height="16" alt="{tr}Edit{/tr}" /></a> - <a class="link" href="tiki-admin_metrics.php?tab_remove={$i|escape:'url'}" title="{tr}Delete{/tr}"><img src="pics/icons/cross.png" width="16" height="16" alt="{tr}Delete{/tr}" /></a> + <a class="link" href="tiki-admin_metrics.php?tab_edit={$i|escape:'url'}#editcreatetab" title="{tr}Edit{/tr}"><img src="img/icons/page_edit.png" width="16" height="16" alt="{tr}Edit{/tr}" /></a> + <a class="link" href="tiki-admin_metrics.php?tab_remove={$i|escape:'url'}" title="{tr}Delete{/tr}"><img src="img/icons/cross.png" width="16" height="16" alt="{tr}Delete{/tr}" /></a> </td> </tr> {/foreach} @@ -78,8 +78,8 @@ <td class="text">{$metrics_list[$assigned_item.metric_id].metric_name|escape}</td> <td class="text">{$tabs_list[$assigned_item.tab_id].tab_name|escape}</td> <td class="action"> - <a class="link" href="tiki-admin_metrics.php?assign_metric_edit={$i|escape:'url'}#assign" title="{tr}Edit{/tr}"><img src="pics/icons/page_edit.png" width="16" height="16" alt="{tr}Edit{/tr}" /></a> - <a class="link" href="tiki-admin_metrics.php?assign_remove={$i|escape:'url'}" title="{tr}Unassign{/tr}"><img src="pics/icons/cross.png" width="16" height="16" alt="{tr}Delete{/tr}" /></a> + <a class="link" href="tiki-admin_metrics.php?assign_metric_edit={$i|escape:'url'}#assign" title="{tr}Edit{/tr}"><img src="img/icons/page_edit.png" width="16" height="16" alt="{tr}Edit{/tr}" /></a> + <a class="link" href="tiki-admin_metrics.php?assign_remove={$i|escape:'url'}" title="{tr}Unassign{/tr}"><img src="img/icons/cross.png" width="16" height="16" alt="{tr}Delete{/tr}" /></a> </td> </tr> {/foreach} diff --git a/templates/tiki-admin_newsletter_subscriptions.tpl b/templates/tiki-admin_newsletter_subscriptions.tpl index 89fc193f0c1..82df1dc5247 100644 --- a/templates/tiki-admin_newsletter_subscriptions.tpl +++ b/templates/tiki-admin_newsletter_subscriptions.tpl @@ -162,7 +162,7 @@ {if $channels} <div align="left"> {tr}Perform action with checked:{/tr} - <input type="image" name="delsel" src='pics/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" /> + <input type="image" name="delsel" src='img/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" /> </div> {/if} diff --git a/templates/tiki-admin_notifications.tpl b/templates/tiki-admin_notifications.tpl index d4ab280d282..126831e1825 100644 --- a/templates/tiki-admin_notifications.tpl +++ b/templates/tiki-admin_notifications.tpl @@ -128,7 +128,7 @@ {if $channels} <br /> {tr}Perform action with checked:{/tr} - <input type="image" name="delsel" src='pics/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" /> + <input type="image" name="delsel" src='img/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}" /> {/if} </form> diff --git a/templates/tiki-calendar_daymode.tpl b/templates/tiki-calendar_daymode.tpl index 1999eb9df30..844b866cf6f 100644 --- a/templates/tiki-calendar_daymode.tpl +++ b/templates/tiki-calendar_daymode.tpl @@ -35,7 +35,7 @@ {/if} {/if} - ><img src="pics/icons/more_info.gif" alt="{tr}Details{/tr}" /></a></span> + ><img src="img/icons/more_info.gif" alt="{tr}Details{/tr}" /></a></span> {if $myurl eq "tiki-action_calendar.php"} <a href="{$event.url}" class="url" title="{$event.web|escape}" class="linkmenu summary" style="color:#{$infocals.$calendarId.customfgcolor};{if $event.status eq '2'}text-decoration:line-through{/if}">{$event.name}</a> {else} diff --git a/templates/tiki-calendar_weekmode.tpl b/templates/tiki-calendar_weekmode.tpl index 32f484f5646..3d132b474ad 100644 --- a/templates/tiki-calendar_weekmode.tpl +++ b/templates/tiki-calendar_weekmode.tpl @@ -52,7 +52,7 @@ href="tiki-calendar_edit_item.php?viewcalitemId={$event.calitemId}" {/if} {/if} - ><img src="pics/icons/more_info.gif" alt="{tr}Details{/tr}" /></a> + ><img src="img/icons/more_info.gif" alt="{tr}Details{/tr}" /></a> </span> <abbr class="dtstart" title="{if $event.result.allday eq '1'}{tr}All day{/tr}{else}{$event.startTimeStamp|isodate}{/if}" {if $event.status eq '2'}style="text-decoration:line-through"{/if}>{$event.name|escape}</abbr> </div> @@ -68,7 +68,7 @@ {/if}> <div style="position:absolute;top:50%;left:50%;margin-left:-40px;margin-top:-30px"> <a style="padding:0 3px;" href="{$myurl}?viewmode=day&todate={$viewWeekDays[weekday]}" - ><img src="pics/icons/multiple_cal.png" alt="{tr}Details{/tr}" /></a> + ><img src="img/icons/multiple_cal.png" alt="{tr}Details{/tr}" /></a> </div> </div> {/if} diff --git a/templates/tiki-change_password.tpl b/templates/tiki-change_password.tpl index eeb09b1ebaf..8f8433616d2 100644 --- a/templates/tiki-change_password.tpl +++ b/templates/tiki-change_password.tpl @@ -18,13 +18,13 @@ pass1 = document.getElementById('pass1').value; pass2 = document.getElementById('pass2').value; if (submit_counter > 10) { - ret_msg.innerHTML = "<img src='pics/icons/exclamation.png' style='vertical-align:middle' alt='Overflow' /> Too many tries"; + ret_msg.innerHTML = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='Overflow' /> Too many tries"; return false; } else if ((pass0 == '') || (pass1 == '') || (pass2 == '')) { - ret_msg.innerHTML = "<img src='pics/icons/exclamation.png' style='vertical-align:middle' alt='Missing' /> Passwords missing"; + ret_msg.innerHTML = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='Missing' /> Passwords missing"; return false; } else if ( pass1 != pass2 ) { - ret_msg.innerHTML = "<img src='pics/icons/exclamation.png' style='vertical-align:middle' alt='Do not match' /> Passwords don\'t match"; + ret_msg.innerHTML = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='Do not match' /> Passwords don\'t match"; return false; } return true; diff --git a/templates/tiki-edit_help.tpl b/templates/tiki-edit_help.tpl index 175b6f14712..7086978252e 100644 --- a/templates/tiki-edit_help.tpl +++ b/templates/tiki-edit_help.tpl @@ -25,12 +25,12 @@ </tr> {cycle values="odd,even" print=false} {if $wysiwyg ne 'y' or ($wysiwyg eq 'y' and $prefs.wysiwyg_wiki_parsed eq 'y')} -<tr class="{cycle}"><td width="20%"><img src='pics/icons/text_bold.png' alt='' /> <strong>{tr}Bold text{/tr}</strong> __{tr}text{/tr}__ </td></tr> -<tr class="{cycle}"><td width="20%"><img src='pics/icons/text_italic.png' alt='' /> <strong>{tr}Italic text{/tr}</strong> 2 {tr}single quotes{/tr} ('). '"{tr}text{/tr}"' </td></tr> -<tr class="{cycle}"><td><img src='pics/icons/text_underline.png' alt='' /> <strong>{tr}Underlined text{/tr}</strong> ==={tr}text{/tr}===</td></tr> -<tr class="{cycle}"><td><img src='pics/icons/palette.png' alt='' /> <strong>{tr}Colored text{/tr}</strong> <br/> ~~#FFEE33:{tr}text{/tr}~~ {tr}or{/tr} ~~yellow:{tr}text{/tr}~~. {tr}Will display using the indicated HTML color or color name. Color name can contain two colors separated by a comma. In this case, the first color would be the foreground and the second one the background.{/tr}</td></tr> -<tr class="{cycle}"><td><img src='pics/icons/text_strikethrough.png' alt='' /> <strong>{tr}Deleted text{/tr}</strong> {tr}2 dashes{/tr} "-". --{tr}text{/tr}--</td></tr> -<tr class="{cycle}"><td><img src='pics/icons/text_heading_1.png' alt='' /><img src='pics/icons/text_heading_2.png' alt='' /><img src='pics/icons/text_heading_3.png' alt='' /> <strong>{tr}Headings{/tr}</strong> <br/> !heading1, !!heading2, !!!heading3 </td></tr> +<tr class="{cycle}"><td width="20%"><img src='img/icons/text_bold.png' alt='' /> <strong>{tr}Bold text{/tr}</strong> __{tr}text{/tr}__ </td></tr> +<tr class="{cycle}"><td width="20%"><img src='img/icons/text_italic.png' alt='' /> <strong>{tr}Italic text{/tr}</strong> 2 {tr}single quotes{/tr} ('). '"{tr}text{/tr}"' </td></tr> +<tr class="{cycle}"><td><img src='img/icons/text_underline.png' alt='' /> <strong>{tr}Underlined text{/tr}</strong> ==={tr}text{/tr}===</td></tr> +<tr class="{cycle}"><td><img src='img/icons/palette.png' alt='' /> <strong>{tr}Colored text{/tr}</strong> <br/> ~~#FFEE33:{tr}text{/tr}~~ {tr}or{/tr} ~~yellow:{tr}text{/tr}~~. {tr}Will display using the indicated HTML color or color name. Color name can contain two colors separated by a comma. In this case, the first color would be the foreground and the second one the background.{/tr}</td></tr> +<tr class="{cycle}"><td><img src='img/icons/text_strikethrough.png' alt='' /> <strong>{tr}Deleted text{/tr}</strong> {tr}2 dashes{/tr} "-". --{tr}text{/tr}--</td></tr> +<tr class="{cycle}"><td><img src='img/icons/text_heading_1.png' alt='' /><img src='img/icons/text_heading_2.png' alt='' /><img src='img/icons/text_heading_3.png' alt='' /> <strong>{tr}Headings{/tr}</strong> <br/> !heading1, !!heading2, !!!heading3 </td></tr> <tr class="{cycle}"><td><strong>{tr}Show/Hide{/tr}</strong> <br/> !+, !!- {tr}show/hide heading section. + (shown) or - (hidden) by default{/tr}.</td></tr> <tr class="{cycle}"><td><strong>{tr}Autonumbered Headings{/tr}</strong> <br/> !#, !!#, !+#, !-# ... </td></tr> @@ -40,18 +40,18 @@ {if $wysiwyg ne 'y' or ($wysiwyg eq 'y' and $prefs.wysiwyg_wiki_parsed eq 'y')} -<tr class="{cycle}"><td><img src='pics/icons/page.png' alt='' /> <strong>{tr}Horizontal rule{/tr}</strong> -<em></em>-<em></em>-<em></em>- </td></tr> -<tr class="{cycle}"><td><img src='pics/icons/box.png' alt='' /> <strong>{tr}Text box{/tr}</strong> ^{tr}Box content{/tr}^</td></tr> -<tr class="{cycle}"><td><img src='pics/icons/text_align_center.png' alt='' /> <strong>{tr}Centered text{/tr}</strong> ::{tr}text::{/tr}</td></tr> +<tr class="{cycle}"><td><img src='img/icons/page.png' alt='' /> <strong>{tr}Horizontal rule{/tr}</strong> -<em></em>-<em></em>-<em></em>- </td></tr> +<tr class="{cycle}"><td><img src='img/icons/box.png' alt='' /> <strong>{tr}Text box{/tr}</strong> ^{tr}Box content{/tr}^</td></tr> +<tr class="{cycle}"><td><img src='img/icons/text_align_center.png' alt='' /> <strong>{tr}Centered text{/tr}</strong> ::{tr}text::{/tr}</td></tr> {/if}{* wysiwyg *} -<tr class="{cycle}"><td><strong><img src='pics/icons/database_gear.png' alt='' /> {tr}Dynamic variables{/tr}</strong> <br/> %{tr}Name{/tr}% {tr}Inserts an editable variable{/tr}</td></tr> +<tr class="{cycle}"><td><strong><img src='img/icons/database_gear.png' alt='' /> {tr}Dynamic variables{/tr}</strong> <br/> %{tr}Name{/tr}% {tr}Inserts an editable variable{/tr}</td></tr> -<tr class="{cycle}"><td><img src='pics/icons/world_link.png' alt='' /> <strong>{tr}External links{/tr}</strong> <br/> {tr}use square brackets for an external link: [URL], [URL|link_description],[URL|link_description|relation] or [URL|description|relation|nocache] (that last prevents the local Wiki from caching the linked page; relation can be used to insert rel attribute for the link - useful e.g. for shadowbox).{/tr}<br /> +<tr class="{cycle}"><td><img src='img/icons/world_link.png' alt='' /> <strong>{tr}External links{/tr}</strong> <br/> {tr}use square brackets for an external link: [URL], [URL|link_description],[URL|link_description|relation] or [URL|description|relation|nocache] (that last prevents the local Wiki from caching the linked page; relation can be used to insert rel attribute for the link - useful e.g. for shadowbox).{/tr}<br /> {tr}For an external Wiki, use ExternalWikiName:PageName or ((External Wiki Name: Page Name)){/tr}</td></tr> <tr class="{cycle}"><td><strong>{tr}Square Brackets{/tr}</strong> <br/> {tr}Use [[foo] to show [foo].{/tr}</td></tr> -<tr class="{cycle}"><td><img src='pics/icons/page_link.png' alt='' /> <strong>{tr}Wiki References{/tr}</strong> <br/> {if $prefs.feature_wikiwords eq 'y'}{tr}JoinCapitalizedWords or use{/tr} {/if}(({tr}page{/tr})) {tr}or{/tr} (({tr}page|description{/tr})) {tr}for wiki references{/tr} +<tr class="{cycle}"><td><img src='img/icons/page_link.png' alt='' /> <strong>{tr}Wiki References{/tr}</strong> <br/> {if $prefs.feature_wikiwords eq 'y'}{tr}JoinCapitalizedWords or use{/tr} {/if}(({tr}page{/tr})) {tr}or{/tr} (({tr}page|description{/tr})) {tr}for wiki references{/tr} {if $prefs.wikiplugin_alink eq 'y'} , (({tr}page|#anchor{/tr})) {tr}or{/tr} (({tr}page|#anchor|desc{/tr})) {tr}for wiki heading/anchor references{/tr} {/if} @@ -60,14 +60,14 @@ {if $wysiwyg ne 'y' or ($wysiwyg eq 'y' and $prefs.wysiwyg_wiki_parsed eq 'y')} -<tr class="{cycle}"><td><img src='pics/icons/text_list_bullets.png' alt='' /> <img src='pics/icons/text_list_numbers.png' alt='' /> <strong>{tr}Lists{/tr}</strong> <br/> * {tr}for bullet lists{/tr}, # {tr}for numbered lists{/tr}, ;{tr}Word:{/tr}{tr}definition{/tr} {tr}for definiton lists{/tr}</td></tr> +<tr class="{cycle}"><td><img src='img/icons/text_list_bullets.png' alt='' /> <img src='img/icons/text_list_numbers.png' alt='' /> <strong>{tr}Lists{/tr}</strong> <br/> * {tr}for bullet lists{/tr}, # {tr}for numbered lists{/tr}, ;{tr}Word:{/tr}{tr}definition{/tr} {tr}for definiton lists{/tr}</td></tr> <tr class="{cycle}"><td><strong>{tr}Indentation{/tr}</strong> <br/>+, ++ {tr}Creates an indentation for each plus (useful in list to continue at the same level){/tr}</td></tr> {if $prefs.feature_wiki_tables eq 'new'} -<tr class="{cycle}"><td><img src='pics/icons/table.png' alt='' /> <strong>{tr}Tables{/tr}</strong> <br/> || {tr}row{/tr}1-{tr}col{/tr}1 | {tr}row{/tr}1-{tr}col{/tr}2 | {tr}row{/tr}1-{tr}col{/tr}3<br />{tr}row{/tr}2-{tr}col{/tr}1 | {tr}row{/tr}2-{tr}col{/tr}2 | {tr}row{/tr}2-{tr}col{/tr}3 ||</td></tr> +<tr class="{cycle}"><td><img src='img/icons/table.png' alt='' /> <strong>{tr}Tables{/tr}</strong> <br/> || {tr}row{/tr}1-{tr}col{/tr}1 | {tr}row{/tr}1-{tr}col{/tr}2 | {tr}row{/tr}1-{tr}col{/tr}3<br />{tr}row{/tr}2-{tr}col{/tr}1 | {tr}row{/tr}2-{tr}col{/tr}2 | {tr}row{/tr}2-{tr}col{/tr}3 ||</td></tr> {else} -<tr class="{cycle}"><td><img src='pics/icons/table.png' alt='' /> <strong>{tr}Tables{/tr}</strong> <br/> ||{tr}row{/tr}1-{tr}col{/tr}1|{tr}row{/tr}1-{tr}col{/tr}2|{tr}row{/tr}1-{tr}col{/tr}3||{tr}row{/tr}2-{tr}col{/tr}1|{tr}row{/tr}2-{tr}col{/tr}2|{tr}row{/tr}2-{tr}col{/tr}3||</td></tr> +<tr class="{cycle}"><td><img src='img/icons/table.png' alt='' /> <strong>{tr}Tables{/tr}</strong> <br/> ||{tr}row{/tr}1-{tr}col{/tr}1|{tr}row{/tr}1-{tr}col{/tr}2|{tr}row{/tr}1-{tr}col{/tr}3||{tr}row{/tr}2-{tr}col{/tr}1|{tr}row{/tr}2-{tr}col{/tr}2|{tr}row{/tr}2-{tr}col{/tr}3||</td></tr> {/if} -<tr class="{cycle}"><td><img src='pics/icons/text_padding_top.png' alt='' /> <strong>{tr}Title bar{/tr}</strong> -={tr}Title{/tr}=- </td></tr> +<tr class="{cycle}"><td><img src='img/icons/text_padding_top.png' alt='' /> <strong>{tr}Title bar{/tr}</strong> -={tr}Title{/tr}=- </td></tr> <tr class="{cycle}"><td width="20%"><strong>{tr}Monospace font{/tr}</strong> -+{tr}Code sample{/tr}+- </td></tr> {/if}{* wysiwyg *} diff --git a/templates/tiki-edit_help_wysiwyg.tpl b/templates/tiki-edit_help_wysiwyg.tpl index bc30b3ea38e..27ef2b462c0 100644 --- a/templates/tiki-edit_help_wysiwyg.tpl +++ b/templates/tiki-edit_help_wysiwyg.tpl @@ -31,7 +31,7 @@ <div style="background-color: #fff; padding: 1em;"> <div class="tiki_plugin" plugin="box" style="position:relative; background-color: #eee; border: 1px solid #666;"> <div contenteditable="false"> - <img src="pics/icons/wiki_plugin_edit.png" width="16" height="16" style="float:left;position:absolute;z-index:10001"/> + <img src="img/icons/wiki_plugin_edit.png" width="16" height="16" style="float:left;position:absolute;z-index:10001"/> <table align="center" width="80%"> <tr><td> <div class='cbox ' style=' background:#fffff0'><div class='cbox-data' style=" background:#fffff0"> diff --git a/templates/tiki-edit_templates.tpl b/templates/tiki-edit_templates.tpl index 3956950bce0..05645ecd573 100644 --- a/templates/tiki-edit_templates.tpl +++ b/templates/tiki-edit_templates.tpl @@ -84,7 +84,7 @@ <input type="submit" name="saveTheme" value="{tr}Save Only in the Theme:{/tr} {$prefs.style|replace:'.css':''}" /> {if $style_local eq 'y'} <a href="tiki-edit_templates.php?template={$template|escape}&delete=y"> - <img src="pics/icons/cross.png" alt="{tr}Delete the copy in the theme:{/tr} {$prefs.style|replace:'.css':''}" + <img src="img/icons/cross.png" alt="{tr}Delete the copy in the theme:{/tr} {$prefs.style|replace:'.css':''}" title="{tr}Delete the copy in the theme:{/tr} {$prefs.style|replace:'.css':''}" /> </a> {/if} diff --git a/templates/tiki-install.tpl b/templates/tiki-install.tpl index 756df2977c2..a88b77f5bf7 100644 --- a/templates/tiki-install.tpl +++ b/templates/tiki-install.tpl @@ -12,7 +12,7 @@ {tr}Tiki installer{/tr} </div> <div id="sitesubtitle" style="font-size: 30px; margin-top: 16px;"> - {$tiki_version_name} <a title="{tr}Help{/tr}" href="http://doc.tiki.org/Installation" target="help"><img style="border:0" src='pics/icons/help.png' alt="{tr}Help{/tr}" /></a> + {$tiki_version_name} <a title="{tr}Help{/tr}" href="http://doc.tiki.org/Installation" target="help"><img style="border:0" src='img/icons/help.png' alt="{tr}Help{/tr}" /></a> </div> </div> </div> @@ -83,11 +83,11 @@ <h2>{tr}Memory{/tr}</h2> {if $php_memory_limit <= 0} <div style="background: #c2eef8; border: 2px solid #2098cd; color:#000;"> - <p align="center"><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki has not detected your PHP memory_limit.{/tr} {tr}This probably means you have no set limit (all is well).{/tr} </p> + <p align="center"><img src="img/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki has not detected your PHP memory_limit.{/tr} {tr}This probably means you have no set limit (all is well).{/tr} </p> </div> {elseif $php_memory_limit < 32 * 1024 * 1024} <div style="background: #ffffcc; border: 2px solid #ff0000; color:#000;"> - <p align="center"><img src="pics/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> {tr}Tiki has detected your PHP memory limit at:{/tr} {$php_memory_limit|kbsize:true:0}</p> + <p align="center"><img src="img/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> {tr}Tiki has detected your PHP memory limit at:{/tr} {$php_memory_limit|kbsize:true:0}</p> </div> <p>{tr}Tiki requires <strong>at least</strong> 32MB of PHP memory for script execution.{/tr} {tr}Allocating too little memory will cause Tiki to display blank pages.{/tr}</p> <p>{tr}To change the memory limit, use the <strong>memory_limit</strong> key in your <strong>php.ini </strong> file (for example: memory_limit = 32M) and restart your webserver.{/tr}</p> @@ -96,7 +96,7 @@ <div style="background: #c2eef8; border: 2px solid #2098cd; color:#000;"> <p align="center"> <span style="font-size: large; padding: 4px;"> - <img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki has detected your PHP memory_limit at:{/tr} {$php_memory_limit|kbsize:true:0}. + <img src="img/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki has detected your PHP memory_limit at:{/tr} {$php_memory_limit|kbsize:true:0}. </span> </p> </div> @@ -132,12 +132,12 @@ {if $mail_test eq 'y'} <div style="background: #c2eef8; border: 2px solid #2098cd; color:#000;"> - <p align="center"><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki was able to send a test message to{/tr} {$email_test_to}.</p> + <p align="center"><img src="img/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki was able to send a test message to{/tr} {$email_test_to}.</p> </div> <p> </p> {else} <div style="background: #ffffcc; border: 2px solid #ff0000; color:#000;"> - <p align="center"><img src="pics/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> {tr}Tiki was not able to send a test message.{/tr} {tr}Review your mail log for details.{/tr}</p> + <p align="center"><img src="img/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> {tr}Tiki was not able to send a test message.{/tr} {tr}Review your mail log for details.{/tr}</p> </div> <p>{tr}Review the mail settings in your <strong>php.ini</strong> file (for example: confirm that the <strong>sendmail_path</strong> is correct).{/tr} {tr}If your host requires SMTP authentication, additional configuration may be necessary.{/tr}</p> {/if} @@ -146,18 +146,18 @@ <h2>{tr}Image Processing{/tr}</h2> {if $gd_test eq 'y'} <div style="background: #c2eef8; border: 2px solid #2098cd; color:#000;"> - <p align="center"><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki detected:{/tr} <strong>GD {$gd_info}</strong>.</p> + <p align="center"><img src="img/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki detected:{/tr} <strong>GD {$gd_info}</strong>.</p> {if $sample_image eq 'y'} - <p align="center"><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki can create images.{/tr}</p> + <p align="center"><img src="img/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki can create images.{/tr}</p> {else} <div style="background: #ffffcc; border: 2px solid #ff0000; color:#000;"> - <p align="center"><img src="pics/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> {tr}Tiki was not able to create a sample image. Please check your GD library configuration.{/tr}.</p> + <p align="center"><img src="img/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> {tr}Tiki was not able to create a sample image. Please check your GD library configuration.{/tr}.</p> </div> {/if} </div> {else} <div style="background: #ffffcc; border: 2px solid #ff0000; color:#000;"> - <p align="center"><img src="pics/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> {tr}Tiki was not able to detect the GD library.{/tr}</p> + <p align="center"><img src="img/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> {tr}Tiki was not able to detect the GD library.{/tr}</p> </div> <p> </p> {/if} @@ -181,12 +181,12 @@ <p>{tr}Tiki requires an active database connection.{/tr} {tr}You must create the database and user <em>before</em> completing this page.{/tr}</p> {if $dbcon ne 'y'} <div align="center" style="padding:1em"> - <img src="pics/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> <span style="font-weight:bold">{tr}Tiki cannot find a database connection.{/tr}</span> {tr}This is normal for a new installation.{/tr} + <img src="img/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> <span style="font-weight:bold">{tr}Tiki cannot find a database connection.{/tr}</span> {tr}This is normal for a new installation.{/tr} </div> {else} <div align="center" style="padding:1em"> <p> - <img src="pics/icons/information.png" alt="{tr}Information{/tr}" style="vertical-align: bottom;" /> + <img src="img/icons/information.png" alt="{tr}Information{/tr}" style="vertical-align: bottom;" /> {tr}Tiki found an existing database connection in your local.php file.{/tr}<br /> <em>{tr _0=$dbname}Database name: "%0"{/tr}</em> </p> @@ -205,12 +205,12 @@ <br /> {section name=n loop=$tikifeedback} <div class="simplebox {if $tikifeedback[n].num > 0} highlight{/if}"> - <img src="pics/icons/{if $tikifeedback[n].num > 0}delete.png" alt="{tr}Error{/tr}"{else}accept.png" alt="{tr}Success{/tr}"{/if} style="vertical-align:middle" /> {$tikifeedback[n].mes} + <img src="img/icons/{if $tikifeedback[n].num > 0}delete.png" alt="{tr}Error{/tr}"{else}accept.png" alt="{tr}Success{/tr}"{/if} style="vertical-align:middle" /> {$tikifeedback[n].mes} </div> {/section} {/if} <div id="installer_3_new_db_form"{if $dbcon eq 'y'} style="display:none;"{/if}> - <p>{tr}Use this page to create a new database connection, or use the <a href="http://doc.tiki.org/Manual+Installation" target="_blank" title="manual installation">manual installation process</a>.{/tr} <a href="http://doc.tiki.org/Manual+Installation" target="_blank" title="{tr}Help{/tr}"><img src="pics/icons/help.png" alt="{tr}Help{/tr}" /></a></p> + <p>{tr}Use this page to create a new database connection, or use the <a href="http://doc.tiki.org/Manual+Installation" target="_blank" title="manual installation">manual installation process</a>.{/tr} <a href="http://doc.tiki.org/Manual+Installation" target="_blank" title="{tr}Help{/tr}"><img src="img/icons/help.png" alt="{tr}Help{/tr}" /></a></p> <form action="tiki-install.php" method="post"> <input type="hidden" name="install_step" value="4" /> {if $multi} <input type="hidden" name="multi" value="{$multi}" />{/if} @@ -226,7 +226,7 @@ <option value="{$dsn}"{if isset($smarty.request.db) and $smarty.request.db eq $dsn} selected="selected"{/if}>{$dbname}</option> {/if} {/foreach} - </select> <a href="javascript:void(0)" onclick="flip('db_help');" title="{tr}Help{/tr}"><img src="pics/icons/help.png" alt="{tr}Help{/tr}" /></a> + </select> <a href="javascript:void(0)" onclick="flip('db_help');" title="{tr}Help{/tr}"><img src="img/icons/help.png" alt="{tr}Help{/tr}" /></a> <div style="display:none" id="db_help"> <p>{tr}Select the type of database to use with Tiki.{/tr}</p> <p>{tr}Only databases supported by your PHP installation are listed here. If your database is not in the list, try to install the appropriate PHP extension.{/tr}</p> @@ -236,7 +236,7 @@ <div style="padding:5px"> <label for="host">{tr}Host name:{/tr}</label> <div style="margin-left:1em"> - <input type="text" name="host" id="host" value="{if isset($smarty.request.host)}{$smarty.request.host|escape:"html"}{else}localhost{/if}" size="40" /> <a href="javascript:void(0)" onclick="flip('host_help');" title="{tr}Help{/tr}"><img src="pics/icons/help.png" alt="{tr}Help{/tr}" /></a> + <input type="text" name="host" id="host" value="{if isset($smarty.request.host)}{$smarty.request.host|escape:"html"}{else}localhost{/if}" size="40" /> <a href="javascript:void(0)" onclick="flip('host_help');" title="{tr}Help{/tr}"><img src="img/icons/help.png" alt="{tr}Help{/tr}" /></a> <br /><em>{tr}Enter the host name or IP for your database.{/tr}</em> <div style="display:none;" id="host_help"> <p>{tr}Use <strong>localhost</strong> if the database is running on the same machine as Tiki.{/tr}</p> @@ -246,7 +246,7 @@ <div style="padding:5px;"> <label for="name">{tr}Database name:{/tr}</label> <div style="margin-left:1em;"> - <input type="text" id="name" name="name" size="40" value="{if isset($smarty.request.name)}{$smarty.request.name|escape:"html"}{/if}" /> <a href="javascript:void(0)" onclick="flip('name_help');" title="{tr}Help{/tr}"><img src="pics/icons/help.png" alt="{tr}Help{/tr}" /></a> + <input type="text" id="name" name="name" size="40" value="{if isset($smarty.request.name)}{$smarty.request.name|escape:"html"}{/if}" /> <a href="javascript:void(0)" onclick="flip('name_help');" title="{tr}Help{/tr}"><img src="img/icons/help.png" alt="{tr}Help{/tr}" /></a> <br /><em>{tr}Enter the name of the database that Tiki will use.{/tr}</em> <div style="margin-left:1em;display:none;" id="name_help"> @@ -326,7 +326,7 @@ <tr> <td valign="top"> <fieldset><legend>{tr}Install{/tr}</legend> - {if $tikidb_created}<p style="text-align:center"><img src="pics/icons/sticky.png" alt="{tr}Warning{/tr}" style="vertical-align:middle" /> <strong>{tr}Warning:{/tr}</strong> {tr _0=$dbname}This will destroy your current database "%0".{/tr}</p>{/if} + {if $tikidb_created}<p style="text-align:center"><img src="img/icons/sticky.png" alt="{tr}Warning{/tr}" style="vertical-align:middle" /> <strong>{tr}Warning:{/tr}</strong> {tr _0=$dbname}This will destroy your current database "%0".{/tr}</p>{/if} {if $tikidb_created} <script type='text/javascript'><!--//--><![CDATA[//><!-- {literal} @@ -377,7 +377,7 @@ </form> {else} {* we are not logged then no admin account found and user not logged *} - <p><img src="pics/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> <span style="font-weight:bold">{tr}This site has an admin account configured.{/tr}</span></p> + <p><img src="img/icons/delete.png" alt="{tr}Alert{/tr}" style="vertical-align:middle" /> <span style="font-weight:bold">{tr}This site has an admin account configured.{/tr}</span></p> <p>{tr}Please log in with your admin password to continue.{/tr}</p> <form name="loginbox" action="tiki-install.php" method="post"> @@ -408,7 +408,7 @@ </p> </div> {if $installer->success|@count gt 0} - <p><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> <span style="font-weight:bold"> + <p><img src="img/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> <span style="font-weight:bold"> {if isset($smarty.post.update)} {tr}Upgrade operations executed successfully:{/tr} {else} @@ -417,7 +417,7 @@ </span> {$installer->success|@count} {tr}SQL queries.{/tr}</p> {else} - <p><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> <span style="font-weight: bold">{tr}Database was left unchanged.{/tr}</span></p> + <p><img src="img/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> <span style="font-weight: bold">{tr}Database was left unchanged.{/tr}</span></p> {/if} <form action="tiki-install.php" method="post"> {if $installer->failures|@count > 0} @@ -429,7 +429,7 @@ {/literal} //--><!]]></script> -<p><img src="pics/icons/delete.png" alt="{tr}Failed{/tr}" style="vertical-align:middle" /> <strong>{tr}Operations failed:{/tr}</strong> {$installer->failures|@count} {tr}SQL queries.{/tr} +<p><img src="img/icons/delete.png" alt="{tr}Failed{/tr}" style="vertical-align:middle" /> <strong>{tr}Operations failed:{/tr}</strong> {$installer->failures|@count} {tr}SQL queries.{/tr} <a href="javascript:sql_failed()">{tr}Display details.{/tr}</a> @@ -457,7 +457,7 @@ {/if} {if isset($htaccess_error) and $htaccess_error eq 'y'} -<h3>{tr}.htaccess File{/tr} <a title="{tr}Help{/tr}" href="http://doc.tiki.org/Installation" target="help"><img style="border:0" src='pics/icons/help.png' alt="{tr}Help{/tr}" /></a></h3> +<h3>{tr}.htaccess File{/tr} <a title="{tr}Help{/tr}" href="http://doc.tiki.org/Installation" target="help"><img style="border:0" src='img/icons/help.png' alt="{tr}Help{/tr}" /></a></h3> {tr}We recommend enabling the <strong>.htaccess</strong> file for your Tiki{/tr}. {tr}This will enable you to use SEFURLs (search engine friendly URLs) and help improve site security{/tr}. <p>{tr _0="<strong>_htaccess</strong>" _1="<strong>.htaccess</strong>"}To enable this file, simply copy the %0 file (located in the main directory of your Tiki installation) to %1.{/tr}</p> {/if} @@ -481,7 +481,7 @@ <p>{tr}Complete these fields to configure common, general settings for your site.{/tr} {tr}The information you enter here can be changed later.{/tr}</p> <p>{tr}Refer to the <a href="http://doc.tiki.org/Admin+Panels" target="_blank">documentation</a> for complete information on these, and other, settings.{/tr}</p> <br /> - <fieldset><legend>{tr}General{/tr} <a href="http://doc.tiki.org/general+admin" target="_blank" title="{tr}Help{/tr}"><img src="pics/icons/help.png" alt="{tr}Help{/tr}" /></a></legend> + <fieldset><legend>{tr}General{/tr} <a href="http://doc.tiki.org/general+admin" target="_blank" title="{tr}Help{/tr}"><img src="img/icons/help.png" alt="{tr}Help{/tr}" /></a></legend> <div style="padding:5px; clear:both"><label for="browsertitle">{tr}Browser title:{/tr}</label> <div style="margin-left:1em"><input type="text" size="40" name="browsertitle" id="browsertitle" onclick="if (this.value=='{tr}My Tiki{/tr}') this.value='';" onfocus="origval=this.value;" onblur="if (this.value=='') this.value=origval;" value="{if $prefs.browsertitle eq ''}{tr}My Tiki{/tr}{else}{$prefs.browsertitle|escape}{/if}" /> <br /><em>{tr}This will appear in the browser title bar.{/tr}</em></div> @@ -495,7 +495,7 @@ <br /> <fieldset> <legend>{tr}Secure Log in{/tr} <a href="http://doc.tiki.org/login+config" target="_blank" title="{tr}Help{/tr}"> - <img src="pics/icons/help.png" alt="{tr}Help{/tr}" /></a> + <img src="img/icons/help.png" alt="{tr}Help{/tr}" /></a> </legend> <div style="padding:5px; clear:both"><label for="https_login">{tr}HTTPS login:{/tr}</label> <select name="https_login" id="https_login" onchange="hidedisabled('httpsoptions',this.value);"> @@ -606,12 +606,12 @@ </p> {if isset($smarty.post.scratch)} - <h3><img src="pics/icons/information.png" alt="{tr}Note{/tr}" style="vertical-align:middle" /> {tr}Installation{/tr}</h3> + <h3><img src="img/icons/information.png" alt="{tr}Note{/tr}" style="vertical-align:middle" /> {tr}Installation{/tr}</h3> <p>{tr}If this is a first time installation, go to <strong>tiki-admin.php</strong> after login to start configuring your new Tiki installation.{/tr}</p> {/if} {if isset($smarty.post.update)} - <h3><img src="pics/icons/information.png" alt="{tr}Note{/tr}" style="vertical-align:middle" /> {tr}Upgrade{/tr}</h3> + <h3><img src="img/icons/information.png" alt="{tr}Note{/tr}" style="vertical-align:middle" /> {tr}Upgrade{/tr}</h3> <p>{tr}If this is an upgrade, clean the Tiki caches manually (the <strong>templates_c</strong> directory) or by using the <strong>Admin > System</strong> option from the Admin menu.{/tr}</p> {/if} @@ -689,7 +689,7 @@ {if $virt} <div class="box-shadow"> <div class="box"> - <h3 class="box-title">{tr}MultiTiki Setup{/tr} <a title="{tr}Help{/tr}" href="http://doc.tiki.org/MultiTiki" target="help"><img style="border:0" src="pics/icons/help.png" alt="{tr}Help{/tr}" /></a></h3> + <h3 class="box-title">{tr}MultiTiki Setup{/tr} <a title="{tr}Help{/tr}" href="http://doc.tiki.org/MultiTiki" target="help"><img style="border:0" src="img/icons/help.png" alt="{tr}Help{/tr}" /></a></h3> <div class="clearfix box-data"> <div><a href="tiki-install.php">{tr}Default Installation{/tr}</a></div> {foreach key=k item=i from=$virt} @@ -718,13 +718,13 @@ {if $dbcon eq 'y' and ($install_step eq '0' or !$install_step)} <div class="box-shadow"> <div class="box"> - <h3 class="box-title"><img src="pics/icons/information.png" alt="{tr}Information{/tr}" style="vertical-align:middle" /> {tr}Upgrade{/tr}</h3> + <h3 class="box-title"><img src="img/icons/information.png" alt="{tr}Information{/tr}" style="vertical-align:middle" /> {tr}Upgrade{/tr}</h3> <div class="clearfix box-data"> {tr}Are you upgrading an existing Tiki site?{/tr} {tr}Go directly to the <strong>Install/Upgrade</strong> step.{/tr} {if $dbcon eq 'y' or isset($smarty.post.scratch) or isset($smarty.post.update)} <a href="tiki-install.php?install_step=4{if $multi}&multi={$multi}{/if}{if $lang}&lang={$lang}{/if}" title="{tr}Install/Upgrade{/tr}"> - <img src="pics/icons/arrow_right.png" alt="{tr}Install/Upgrade{/tr}" height="16" width="16" /> + <img src="img/icons/arrow_right.png" alt="{tr}Install/Upgrade{/tr}" height="16" width="16" /> </a> {/if} </div> @@ -758,8 +758,8 @@ <h3 class="box-title">{tr}Help{/tr}</h3> <div class="clearfix box-data"> <p><img src="favicon.png" alt="{tr}Tiki Icon{/tr}" style="vertical-align:middle" /> <a href="http://tiki.org" target="_blank">{tr}Tiki Project Web Site{/tr}</a></p> - <p><img src="pics/icons/book_open.png" alt="{tr}Documentation{/tr}" style="vertical-align:middle" /> <a href="http://doc.tiki.org" target="_blank">{tr}Documentation{/tr}</a></p> - <p><img src="pics/icons/group.png" alt="{tr}Forums{/tr}" style="vertical-align:middle" /> <a href="http://tiki.org/forums" target="_blank">{tr}Support Forums{/tr}</a></p> + <p><img src="img/icons/book_open.png" alt="{tr}Documentation{/tr}" style="vertical-align:middle" /> <a href="http://doc.tiki.org" target="_blank">{tr}Documentation{/tr}</a></p> + <p><img src="img/icons/group.png" alt="{tr}Forums{/tr}" style="vertical-align:middle" /> <a href="http://tiki.org/forums" target="_blank">{tr}Support Forums{/tr}</a></p> </div> </div> </div> diff --git a/templates/tiki-list_cache.tpl b/templates/tiki-list_cache.tpl index 61f3032bdf0..7a544bad0c0 100644 --- a/templates/tiki-list_cache.tpl +++ b/templates/tiki-list_cache.tpl @@ -26,9 +26,9 @@ {$listpages[changes].refresh|tiki_short_datetime} </td> <td class="action"> - <a class="link" target="_blank" href="tiki-view_cache.php?cacheId={$listpages[changes].cacheId}" title="{tr}View{/tr}"><img src="pics/icons/magnifier.png" width="16" height="16" alt="{tr}View{/tr}" /></a> - <a class="link" href="tiki-list_cache.php?offset={$offset}&sort_mode={$sort_mode}&remove={$listpages[changes].cacheId}" title="{tr}Remove{/tr}"><img src="pics/icons/cross.png" height="16" width="16" alt="{tr}Remove{/tr}" /></a> - <a class="link" href="tiki-list_cache.php?offset={$offset}&sort_mode={$sort_mode}&refresh={$listpages[changes].cacheId}" title="{tr}Refresh{/tr}"><img src="pics/icons/arrow_refresh.png" height="16" width="16" alt="{tr}Refresh{/tr}" /></a> + <a class="link" target="_blank" href="tiki-view_cache.php?cacheId={$listpages[changes].cacheId}" title="{tr}View{/tr}"><img src="img/icons/magnifier.png" width="16" height="16" alt="{tr}View{/tr}" /></a> + <a class="link" href="tiki-list_cache.php?offset={$offset}&sort_mode={$sort_mode}&remove={$listpages[changes].cacheId}" title="{tr}Remove{/tr}"><img src="img/icons/cross.png" height="16" width="16" alt="{tr}Remove{/tr}" /></a> + <a class="link" href="tiki-list_cache.php?offset={$offset}&sort_mode={$sort_mode}&refresh={$listpages[changes].cacheId}" title="{tr}Refresh{/tr}"><img src="img/icons/arrow_refresh.png" height="16" width="16" alt="{tr}Refresh{/tr}" /></a> </td> </tr> {sectionelse} diff --git a/templates/tiki-list_kaltura_entries_actions.tpl b/templates/tiki-list_kaltura_entries_actions.tpl index dde19ed325f..5543434429e 100644 --- a/templates/tiki-list_kaltura_entries_actions.tpl +++ b/templates/tiki-list_kaltura_entries_actions.tpl @@ -4,20 +4,20 @@ <div class='box-title'><strong>{tr}Actions{/tr}</strong></div> <div class='box-data'> {if $tiki_p_view_videos eq 'y' or $tiki_p_admin_kaltura eq 'y' or $tiki_p_admin eq 'y'} - <a href="{$item->downloadUrl}" title="{tr}Download{/tr}" class="iconmenu"><img alt="" src="pics/icons/application_put.png" class="icon" />{tr}Download{/tr}</a> + <a href="{$item->downloadUrl}" title="{tr}Download{/tr}" class="iconmenu"><img alt="" src="img/icons/application_put.png" class="icon" />{tr}Download{/tr}</a> {/if} {if $tiki_p_edit_videos eq 'y' or $tiki_p_admin_kaltura eq 'y' or $tiki_p_admin eq 'y'} - <a href="tiki-kaltura_video.php?{$entryType}Id={$item->id}&action=edit" class="iconmenu"><img alt="" src="pics/icons/page_edit.png" class="icon" />{tr}Change Details{/tr}</a> + <a href="tiki-kaltura_video.php?{$entryType}Id={$item->id}&action=edit" class="iconmenu"><img alt="" src="img/icons/page_edit.png" class="icon" />{tr}Change Details{/tr}</a> {/if} {if $tiki_p_remix_videos eq 'y' or $tiki_p_admin_kaltura eq 'y' or $tiki_p_admin eq 'y'} - <a href="tiki-kaltura_video.php?{$entryType}Id={$item->id}&action=remix" class="iconmenu"><img alt="" src="pics/icons/layers.png" class="icon" />{tr}Remix Video{/tr}</a> + <a href="tiki-kaltura_video.php?{$entryType}Id={$item->id}&action=remix" class="iconmenu"><img alt="" src="img/icons/layers.png" class="icon" />{tr}Remix Video{/tr}</a> {if $entryType eq "mix"} - <a href="tiki-kaltura_video.php?{$entryType}Id={$item->id}&action=dupl" class="iconmenu"><img alt="" src="pics/icons/layers.png" class="icon" />{tr}Duplicate{/tr}</a> + <a href="tiki-kaltura_video.php?{$entryType}Id={$item->id}&action=dupl" class="iconmenu"><img alt="" src="img/icons/layers.png" class="icon" />{tr}Duplicate{/tr}</a> {/if} {/if} {if $tiki_p_delete_videos eq 'y' or $tiki_p_admin_kaltura eq 'y' or $tiki_p_admin eq 'y'} - <a href="tiki-kaltura_video.php?{$entryType}Id={$item->id}&action=delete" class ="iconmenu" ><img alt="" src="pics/icons/cross.png" class="icon"/>{tr}Delete{/tr}</a> + <a href="tiki-kaltura_video.php?{$entryType}Id={$item->id}&action=delete" class ="iconmenu" ><img alt="" src="img/icons/cross.png" class="icon"/>{tr}Delete{/tr}</a> {/if} </div> </div> diff --git a/templates/tiki-list_kaltura_mix_entries.tpl b/templates/tiki-list_kaltura_mix_entries.tpl index f1d2d4ce175..0ab0650c9dd 100644 --- a/templates/tiki-list_kaltura_mix_entries.tpl +++ b/templates/tiki-list_kaltura_mix_entries.tpl @@ -19,7 +19,7 @@ <td class="checkbox"><input type="checkbox" name="mixId[]" value="{$item->id}" /></td> <td class="text"><a href="#" {popup trigger="onclick" sticky=1 fullhtml="1" text=$smarty.capture.actions|escape:"javascript"|escape:"html"}><img class="athumb" src="{$item->thumbnailUrl}" alt="{$item->description}" height="80" width="120"/></a></td> - <td class="text"><a href="tiki-kaltura_video.php?{$entryType}Id={$item->id}"><img src="pics/icons/application_form_magnify.png" class="icon" /> {$item->name}</a></td> + <td class="text"><a href="tiki-kaltura_video.php?{$entryType}Id={$item->id}"><img src="img/icons/application_form_magnify.png" class="icon" /> {$item->name}</a></td> <td class="text">{$item->createdAt}</td> <td class="text">{$item->tags}</td> <td class="text">{$modifiedAt[$key]} diff --git a/templates/tiki-read_article.tpl b/templates/tiki-read_article.tpl index 10167235405..60c7d309c71 100644 --- a/templates/tiki-read_article.tpl +++ b/templates/tiki-read_article.tpl @@ -132,7 +132,7 @@ {if $pages > 1} <div align="center"> - <a href="{$articleId|sefurl:article:with_next}page={$first_page}"><img src='pics/icons/resultset_first.png' alt="{tr}First page{/tr}" title="{tr}First page{/tr}" width='16' height='16' /></a> + <a href="{$articleId|sefurl:article:with_next}page={$first_page}"><img src='img/icons/resultset_first.png' alt="{tr}First page{/tr}" title="{tr}First page{/tr}" width='16' height='16' /></a> <a href="{$articleId|sefurl:article:with_next}page={$prev_page}">{icon _id='resultset_previous' alt="{tr}Previous page{/tr}"}</a> @@ -140,7 +140,7 @@ <a href="{$articleId|sefurl:article:with_next}page={$next_page}">{icon _id='resultset_next' alt="{tr}Next page{/tr}"}</a> - <a href="{$articleId|sefurl:article:with_next}page={$last_page}"><img src='pics/icons/resultset_last.png' alt="{tr}Last page{/tr}" title="{tr}Last page{/tr}" width='16' height='16' ></a> + <a href="{$articleId|sefurl:article:with_next}page={$last_page}"><img src='img/icons/resultset_last.png' alt="{tr}Last page{/tr}" title="{tr}Last page{/tr}" width='16' height='16' ></a> </div> {/if} </div> diff --git a/templates/tiki-sheets_listing.tpl b/templates/tiki-sheets_listing.tpl index baf44e77315..946a1fb96d1 100755 --- a/templates/tiki-sheets_listing.tpl +++ b/templates/tiki-sheets_listing.tpl @@ -17,7 +17,7 @@ <td class="action"> {if $chart_enabled eq 'y'} <a class="gallink" href="tiki-graph_sheet.php?sheetId={$sheet.sheetId}"> - <img src='pics/icons/chart_curve.png' width='16' height='16' alt="{tr}Graph{/tr}" title="{tr}Graph{/tr}" /> + <img src='img/icons/chart_curve.png' width='16' height='16' alt="{tr}Graph{/tr}" title="{tr}Graph{/tr}" /> </a> {/if} {if $tiki_p_view_sheet_history eq 'y'} diff --git a/templates/tiki-show_page_raw.tpl b/templates/tiki-show_page_raw.tpl index f046734934c..a4c9a263036 100644 --- a/templates/tiki-show_page_raw.tpl +++ b/templates/tiki-show_page_raw.tpl @@ -45,9 +45,9 @@ <a href="#" onclick="$.s5.prev(); return false;" title="{tr}Previous Slide{/tr}"> <img src="lib/jquery.s5/images/resultset_previous.png" alt="{tr}Previous Slide{/tr}" /></a> <a href="#" onclick="$.s5.goLI('prev'); return false;" title="{tr}Previous Point{/tr}"> - <img src="pics/icons/resultset_up.png" alt="{tr}Previous Point{/tr}" /></a> + <img src="img/icons/resultset_up.png" alt="{tr}Previous Point{/tr}" /></a> <a href="#" onclick="$.s5.goLI('next'); return false;" title="{tr}Next Point{/tr}"> - <img src="pics/icons/resultset_down.png" alt="{tr}Next Point{/tr}" /></a> + <img src="img/icons/resultset_down.png" alt="{tr}Next Point{/tr}" /></a> <a href="#" onclick="$.s5.next(); return false;" title="{tr}Next Slide{/tr}"> <img src="lib/jquery.s5/images/resultset_next.png" alt="{tr}Next Slide{/tr}" /></a> <a href="#" onclick="$.s5.last(); return false;" title="{tr}Last Slide{/tr}"> @@ -69,7 +69,7 @@ <img alt="{tr}Export to PDF{/tr}" src="lib/jquery.s5/images/page_go.png" /></a> {/if} <a href="tiki-index.php?page={$page}" title="{tr}Exit{/tr}"> - <img src="pics/icons/cross.png" alt="{tr}Exit{/tr}" /></a> + <img src="img/icons/cross.png" alt="{tr}Exit{/tr}" /></a> <select class="tiki-slideshow-theme"> <option value="">{tr}Change Theme{/tr}</option> <option value="default">default</option> @@ -105,9 +105,9 @@ <a href="#" onclick="window.opener.$.s5.prev(); return false;" title="{tr}Previous Slide{/tr}"> <img src="lib/jquery.s5/images/resultset_previous.png" alt="{tr}Previous Slide{/tr}" /></a> <a href="#" onclick="window.opener.$.s5.goLI('prev'); return false;" title="{tr}Previous Point{/tr}"> - <img src="pics/icons/resultset_up.png" alt="{tr}Previous Point{/tr}" /></a> + <img src="img/icons/resultset_up.png" alt="{tr}Previous Point{/tr}" /></a> <a href="#" onclick="window.opener.$.s5.goLI('next'); return false;" title="{tr}Next Point{/tr}"> - <img src="pics/icons/resultset_down.png" alt="{tr}Next Point{/tr}" /></a> + <img src="img/icons/resultset_down.png" alt="{tr}Next Point{/tr}" /></a> <a href="#" onclick="window.opener.$.s5.next(); return false;" title="{tr}Next Slide{/tr}"> <img src="lib/jquery.s5/images/resultset_next.png" alt="{tr}Next Slide{/tr}" /></a> <a href="#" onclick="window.opener.$.s5.last(); return false;" title="{tr}Last Slide{/tr}"> @@ -129,7 +129,7 @@ <img alt="{tr}Export to PDF{/tr}" src="lib/jquery.s5/images/page_go.png" /></a> {/if} <a href="tiki-index.php?page={$page}" title="{tr}Exit{/tr}"> - <img src="pics/icons/cross.png" alt="{tr}Exit{/tr}" /></a> + <img src="img/icons/cross.png" alt="{tr}Exit{/tr}" /></a> <select class="tiki-slideshow-theme"> <option value="">{tr}Change Theme{/tr}</option> <option value="default">default</option> diff --git a/templates/tiki-view_forum.tpl b/templates/tiki-view_forum.tpl index d66dc3e8d83..364e1660bee 100644 --- a/templates/tiki-view_forum.tpl +++ b/templates/tiki-view_forum.tpl @@ -301,12 +301,12 @@ <tr class="odd"> <td class="action" colspan="3"> {if $all_forums|@count > 1} - <input type="image" name="movesel" src="pics/icons/task_submitted.png" alt="{tr}Move{/tr}" title="{tr}Move Selected Topics{/tr}" /> + <input type="image" name="movesel" src="img/icons/task_submitted.png" alt="{tr}Move{/tr}" title="{tr}Move Selected Topics{/tr}" /> {/if} - <input type="image" name="unlocksel" src="pics/icons/lock_break.png" alt="{tr}Unlock{/tr}" title="{tr}Unlock Selected Topics{/tr}" /> - <input type="image" name="locksel" src="pics/icons/lock_add.png" alt="{tr}Lock{/tr}" title="{tr}Lock Selected Topics{/tr}" /> - <input type="image" name="delsel" src="pics/icons/cross.png" alt="{tr}Delete{/tr}" title="{tr}Delete Selected Topics{/tr}" /> - <input type="image" name="splitsel" src="pics/icons/arrow_merge.png" alt="{tr}Merge{/tr}" title="{tr}Merge Selected Topics{/tr}" /> + <input type="image" name="unlocksel" src="img/icons/lock_break.png" alt="{tr}Unlock{/tr}" title="{tr}Unlock Selected Topics{/tr}" /> + <input type="image" name="locksel" src="img/icons/lock_add.png" alt="{tr}Lock{/tr}" title="{tr}Lock Selected Topics{/tr}" /> + <input type="image" name="delsel" src="img/icons/cross.png" alt="{tr}Delete{/tr}" title="{tr}Delete Selected Topics{/tr}" /> + <input type="image" name="splitsel" src="img/icons/arrow_merge.png" alt="{tr}Merge{/tr}" title="{tr}Merge Selected Topics{/tr}" /> </td> <td style="text-align:right;" class="odd" colspan="10"> {if $reported > 0} diff --git a/tiki-browse_categories.php b/tiki-browse_categories.php index 87a7647d1b8..5bca28a523b 100644 --- a/tiki-browse_categories.php +++ b/tiki-browse_categories.php @@ -184,10 +184,10 @@ function add_watch_icons($descendants, $usercatwatches, $requestid, $categid, $d $tip_add_desc = tra('Watch this category and its descendants'); $tip_group = tra('Group watches for this category'); } - $eye_rem_desc = ' <a href="tiki-browse_categories.php?parentId=' . $requestid . '&watch_event=category_changed&watch_object=' . $categid . '&deep=' . $deep . '&watch_action=remove_desc" class="catname"><img src="pics/icons/no_eye_arrow_down.png" alt="' . $tip_rem_desc . '" style="margin-right:2px" width="14" height="14" title="' . $tip_rem_desc . '" class="catname" /></a>'; - $eye_rem = '<a href="tiki-browse_categories.php?parentId=' . $requestid . '&watch_event=category_changed&watch_object=' . $categid . '&deep=' . $deep . '&watch_action=remove" class="catname"><img src="pics/icons/no_eye.png" alt="'.tra("Stop watching this category").'" width="14" style="margin-right:3px" height="14" title="'.tra("Stop watching this category").'" class="catname" /></a>'; - $eye_add_desc = ' <a href="tiki-browse_categories.php?parentId=' . $requestid . '&watch_event=category_changed&watch_object=' . $categid . '&deep=' . $deep . '&watch_action=add_desc" class="catname"><img src="pics/icons/eye_arrow_down.png" alt="' . $tip_add_desc . '" style="margin-right:2px" width="14" height="14" title="' . $tip_add_desc . '" class="catname" /></a>'; - $eye_add = '<a href="tiki-browse_categories.php?parentId=' . $requestid . '&watch_event=category_changed&watch_object=' . $categid . '&deep=' . $deep . '&watch_action=add" class="icon"><img src="pics/icons/eye.png" alt="'.tra("Watch this category").'" width="14" style="margin-right:3px;margin-bottom:0.052cm" height="14" title="'.tra("Watch this category").'" class="catname" /></a>'; + $eye_rem_desc = ' <a href="tiki-browse_categories.php?parentId=' . $requestid . '&watch_event=category_changed&watch_object=' . $categid . '&deep=' . $deep . '&watch_action=remove_desc" class="catname"><img src="img/icons/no_eye_arrow_down.png" alt="' . $tip_rem_desc . '" style="margin-right:2px" width="14" height="14" title="' . $tip_rem_desc . '" class="catname" /></a>'; + $eye_rem = '<a href="tiki-browse_categories.php?parentId=' . $requestid . '&watch_event=category_changed&watch_object=' . $categid . '&deep=' . $deep . '&watch_action=remove" class="catname"><img src="img/icons/no_eye.png" alt="'.tra("Stop watching this category").'" width="14" style="margin-right:3px" height="14" title="'.tra("Stop watching this category").'" class="catname" /></a>'; + $eye_add_desc = ' <a href="tiki-browse_categories.php?parentId=' . $requestid . '&watch_event=category_changed&watch_object=' . $categid . '&deep=' . $deep . '&watch_action=add_desc" class="catname"><img src="img/icons/eye_arrow_down.png" alt="' . $tip_add_desc . '" style="margin-right:2px" width="14" height="14" title="' . $tip_add_desc . '" class="catname" /></a>'; + $eye_add = '<a href="tiki-browse_categories.php?parentId=' . $requestid . '&watch_event=category_changed&watch_object=' . $categid . '&deep=' . $deep . '&watch_action=add" class="icon"><img src="img/icons/eye.png" alt="'.tra("Watch this category").'" width="14" style="margin-right:3px;margin-bottom:0.052cm" height="14" title="'.tra("Watch this category").'" class="catname" /></a>'; foreach ($descendants as $descendant) { if ($nodesc > 1) { //this category and descendants @@ -233,7 +233,7 @@ function add_watch_icons($descendants, $usercatwatches, $requestid, $categid, $d } $eyesgroup = ' <a href="tiki-object_watches.php?objectId=' . $categid . '&watch_event=category_changed&objectType=Category&objectName=' . urlencode($objName) . '&objectHref=tiki-browse_categories.php?parentId=' . $categid . '&deep=' . $deep . '" > - <img src="pics/icons/eye_group.png" alt="' . $tip_group . '" width="14" style="margin-bottom:2px" height="14" + <img src="img/icons/eye_group.png" alt="' . $tip_group . '" width="14" style="margin-bottom:2px" height="14" title="' . $tip_group . '" class="catname" /></a>'; } return $eyes . $eyesgroup; diff --git a/tiki-map.php b/tiki-map.php index 9885ea42ad9..13789f569a7 100644 --- a/tiki-map.php +++ b/tiki-map.php @@ -122,7 +122,7 @@ function userErrorHandler($errno, $errmsg, $filename, $linenum, $vars) { $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="pics/icons/wrench.png" alt="' . tra("edit") . '" title="' . tra("edit") . '" width="16" height="16" />'; + $msg.= '<img src="img/icons/wrench.png" alt="' . tra("edit") . '" title="' . tra("edit") . '" width="16" height="16" />'; $msg.= '</a>'; } $smarty->assign('msg', $msg); -- GitLab