[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[55793] branches/14.x/templates

[<li...@us...>]

Revision: 55793
          http://sourceforge.net/p/tikiwiki/code/55793
Author:   lindonb
Date:     2015-06-29 00:25:23 +0000 (Mon, 29 Jun 2015)
Log Message:
-----------
[FIX] use iconsets

Modified Paths:
--------------
    branches/14.x/templates/admin/include_calendar.tpl
    branches/14.x/templates/admin/include_features.tpl
    branches/14.x/templates/admin/include_general.tpl
    branches/14.x/templates/admin/include_intertiki.tpl
    branches/14.x/templates/admin/include_login.tpl
    branches/14.x/templates/admin/include_metatags.tpl
    branches/14.x/templates/tiki-user_watches.tpl
    branches/14.x/templates/tiki-webmail.tpl
    branches/14.x/templates/tiki-webmail_contacts.tpl
    branches/14.x/templates/user_registration.tpl

Modified: branches/14.x/templates/admin/include_calendar.tpl
===================================================================
--- branches/14.x/templates/admin/include_calendar.tpl	2015-06-29 00:24:40 UTC (rev 55792)
+++ branches/14.x/templates/admin/include_calendar.tpl	2015-06-29 00:25:23 UTC (rev 55793)
@@ -75,7 +75,7 @@
 			</div>
 		</div>
 		<div id="usejscalendar" style="display:{if $prefs.feature_jscalendar eq 'y'}none{else}block{/if}">
-			{icon _id=information} {tr}Year selection is valid when the JS Calendar <strong>is not</strong> enabled{/tr}.
+			{icon name='information'} {tr}Year selection is valid when the JS Calendar <strong>is not</strong> enabled{/tr}.
 			{preference name=calendar_start_year}
 			{preference name=calendar_end_year}
 		</div>

Modified: branches/14.x/templates/admin/include_features.tpl
===================================================================
--- branches/14.x/templates/admin/include_features.tpl	2015-06-29 00:24:40 UTC (rev 55792)
+++ branches/14.x/templates/admin/include_features.tpl	2015-06-29 00:25:23 UTC (rev 55793)
@@ -168,7 +168,7 @@
 				{preference name=jquery_fitvidjs}
 				<div class="adminoptionboxchild">
 					<fieldset>
-						<legend> {tr}Experimental:{/tr} {icon _id=bug_error}</legend>
+						<legend> {tr}Experimental:{/tr} {icon name='bug'}</legend>
 						{preference name=feature_jquery_carousel}
 						{preference name=feature_jquery_tablesorter}
 					</fieldset>

Modified: branches/14.x/templates/admin/include_general.tpl
===================================================================
--- branches/14.x/templates/admin/include_general.tpl	2015-06-29 00:24:40 UTC (rev 55792)
+++ branches/14.x/templates/admin/include_general.tpl	2015-06-29 00:25:23 UTC (rev 55793)
@@ -156,7 +156,7 @@
 					{tr}Note that storing session data in the database is an advanced systems administration option, and is for admins who have comprehensive access and understanding of the database, in order to deal with any unexpected effects.{/tr}
 				{/remarksbox}
 				<div style="padding:.5em; text-align:left;">
-					{icon _id=information style="vertical-align:middle"} {tr}Changing this feature will immediately log you out when you save this preference.{/tr} {if $prefs.forgotPass ne 'y'}If there is a chance you have forgotten your password, enable "Forget password" feature.<a href="tiki-admin.php?page=features" title="{tr}Features{/tr}">{tr}Enable now{/tr}</a>.{/if}
+					{icon name='information' style="vertical-align:middle"} {tr}Changing this feature will immediately log you out when you save this preference.{/tr} {if $prefs.forgotPass ne 'y'}If there is a chance you have forgotten your password, enable "Forget password" feature.<a href="tiki-admin.php?page=features" title="{tr}Features{/tr}">{tr}Enable now{/tr}</a>.{/if}
 				</div>
 				{preference name=session_storage}
 				{preference name=session_lifetime}

Modified: branches/14.x/templates/admin/include_intertiki.tpl
===================================================================
--- branches/14.x/templates/admin/include_intertiki.tpl	2015-06-29 00:24:40 UTC (rev 55792)
+++ branches/14.x/templates/admin/include_intertiki.tpl	2015-06-29 00:25:23 UTC (rev 55793)
@@ -65,7 +65,7 @@
 					{foreach key=k item=i from=$prefs.interlist}
 						<tr>
 							<td colspan="2">
-								<a href="tiki-admin.php?page=intertiki&amp;del={$k|escape:'url'}">{icon _id='cross' alt="{tr}Delete{/tr}"}</a>
+								<a href="tiki-admin.php?page=intertiki&amp;del={$k|escape:'url'}" class="tips" title=":{tr}Delete{/tr}">{icon name='delete'}</a>
 								{tr}InterTiki Server{/tr} <b>{$k}</b>
 							</td>
 						</tr>
@@ -180,7 +180,7 @@
 									{foreach key=k item=i from=$prefs.known_hosts}
 										<tr>
 											<td>
-												<a href="tiki-admin.php?page=intertiki&amp;delk={$k|escape:'url'}">{icon _id='cross' alt="{tr}Delete{/tr}"}</a>
+												<a href="tiki-admin.php?page=intertiki&amp;delk={$k|escape:'url'}" class="tips" title=":{tr}Delete{/tr}">{icon name='delete'}</a>
 											</td>
 											<td>
 												<input type="text" name="known_hosts[{$k}][name]" value="{$i.name}" size="12" />

Modified: branches/14.x/templates/admin/include_login.tpl
===================================================================
--- branches/14.x/templates/admin/include_login.tpl	2015-06-29 00:24:40 UTC (rev 55792)
+++ branches/14.x/templates/admin/include_login.tpl	2015-06-29 00:25:23 UTC (rev 55793)
@@ -59,7 +59,7 @@
 
 					{if $gd_lib_found neq 'y'}
 						<div class="highlight">
-							{icon _id=information} {tr}Requires PHP GD library{/tr}.
+							{icon name='information'} {tr}Requires PHP GD library{/tr}.
 						</div>
 					{/if}
 					{preference name=generate_password}
@@ -197,7 +197,7 @@
 				<legend>LDAP {help url="Login+Authentication+Methods"}</legend>
 				{if $prefs.auth_method ne 'ldap'}
 					<div class="alert alert-warning">
-						<div>{icon _id=information} {tr}You must change the Authentication Method to LDAP for these changes to take effect{/tr}.</div>
+						<div>{icon name='information'} {tr}You must change the Authentication Method to LDAP for these changes to take effect{/tr}.</div>
 					</div>
 				{/if}
 
@@ -304,7 +304,7 @@
 				{if $prefs.auth_method ne 'pam'}
 					<div class="alert alert-warning">
 						<div>
-							{icon _id=information} {tr}You must change the Authentication Method to PAM for these changes to take effect{/tr}.
+							{icon name='information'} {tr}You must change the Authentication Method to PAM for these changes to take effect{/tr}.
 						</div>
 					</div>
 				{/if}
@@ -322,7 +322,7 @@
 				<input type="hidden" name="auth_shib" />
 				{if $prefs.auth_method ne 'shib'}
 					<div class="alert alert-warning">
-						<div>{icon _id=information} {tr}You must change the Authentication Method to Shibboleth for these changes to take effect{/tr}.</div>
+						<div>{icon name='information'} {tr}You must change the Authentication Method to Shibboleth for these changes to take effect{/tr}.</div>
 					</div>
 				{/if}
 
@@ -345,7 +345,7 @@
 				{if $prefs.auth_method ne 'cas'}
 					<div class="alert alert-warning">
 						<div>
-							{icon _id=information} {tr}You must change the Authentication Method to CAS for these changes to take effect{/tr}.
+							{icon name='information'} {tr}You must change the Authentication Method to CAS for these changes to take effect{/tr}.
 						</div>
 					</div>
 				{/if}
@@ -380,7 +380,7 @@
 				{/if}
 				{if $prefs.allowRegister ne 'n'}
 					<div class="alert alert-warning">
-						<div>{icon _id=information} {tr}You must turn Users can register off for phpBB Authentication to function properly{/tr}.</div>
+						<div>{icon name='information'} {tr}You must turn Users can register off for phpBB Authentication to function properly{/tr}.</div>
 					</div>
 				{/if}
 				{preference name=auth_phpbb_create_tiki}
@@ -406,7 +406,7 @@
 				{if $prefs.auth_method ne 'ws'}
 					<div class="alert alert-warning">
 						<div>
-							{icon _id=information} {tr}You must change the Authentication Method to Web Server for these changes to take effect{/tr}.
+							{icon name='information'} {tr}You must change the Authentication Method to Web Server for these changes to take effect{/tr}.
 						</div>
 					</div>
 				{/if}

Modified: branches/14.x/templates/admin/include_metatags.tpl
===================================================================
--- branches/14.x/templates/admin/include_metatags.tpl	2015-06-29 00:24:40 UTC (rev 55792)
+++ branches/14.x/templates/admin/include_metatags.tpl	2015-06-29 00:25:23 UTC (rev 55793)
@@ -29,7 +29,7 @@
 		{/tab}
 
 		{tab name="{tr}Geo Metatags{/tr}"}
-			<h2>{tr}Geo Metatags{/tr} {if $prefs.feature_help eq 'y'}<a target="_blank" href="http://en.wikipedia.org/wiki/Geotagging#HTML_pages">{icon _id='help'}</a>{/if}</h2>
+			<h2>{tr}Geo Metatags{/tr} {if $prefs.feature_help eq 'y'}<a target="_blank" href="http://en.wikipedia.org/wiki/Geotagging#HTML_pages">{icon name='help'}</a>{/if}</h2>
 
 			{preference name=metatag_geoposition}
 			{preference name=metatag_georegion}

Modified: branches/14.x/templates/tiki-user_watches.tpl
===================================================================
--- branches/14.x/templates/tiki-user_watches.tpl	2015-06-29 00:24:40 UTC (rev 55792)
+++ branches/14.x/templates/tiki-user_watches.tpl	2015-06-29 00:25:23 UTC (rev 55793)
@@ -56,7 +56,7 @@
 	{tab name="{tr}My watches{/tr}"}
 		<h2>{tr}My watches{/tr}</h2>
 
-		{remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Use "watches" to monitor wiki pages or other objects.{/tr} {tr}Watch new items by clicking the {icon _id=eye} button on specific pages.{/tr}{/remarksbox}
+		{remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Use "watches" to monitor wiki pages or other objects.{/tr} {tr}Watch new items by clicking the {icon name='watch'} button on specific pages.{/tr}{/remarksbox}
 
 		{if $add_options|@count > 0}
 			<h3>{tr}Add Watch{/tr}</h3>

Modified: branches/14.x/templates/tiki-webmail.tpl
===================================================================
--- branches/14.x/templates/tiki-webmail.tpl	2015-06-29 00:24:40 UTC (rev 55792)
+++ branches/14.x/templates/tiki-webmail.tpl	2015-06-29 00:25:23 UTC (rev 55793)
@@ -122,9 +122,9 @@
 								<tr>
 									<td class="icon">
 										{if !$active}
-											{self_link _icon='star_grey' current=$pubAccounts[ixp].accountId}{tr}Activate{/tr}{/self_link}
+											{self_link _icon_name='star-half' current=$pubAccounts[ixp].accountId}{tr}Activate{/tr}{/self_link}
 										{else}
-											{icon _id='star' alt="{tr}This is the active account.{/tr}"}
+											{icon name='star' iclass='tips' ititle=':{tr}This is the active account.{/tr}'}
 										{/if}
 									</td>
 									<td class="username">
@@ -245,7 +245,7 @@
 									<input type="text" name="fromEmail" value="{$info.fromEmail}">
 								</td>
 								<td>
-									<em>{tr}Uses the user's login email address if empty{/tr} ({if !empty($userEmail)}{$userEmail}{else}<strong>{tr}No email set:{/tr}</strong> {icon _id="arrow_right" href="tiki-user_preferences.php?cookietab=2"}{/if})</em>
+									<em>{tr}Uses the user's login email address if empty{/tr} ({if !empty($userEmail)}{$userEmail}{else}<strong>{tr}No email set:{/tr}</strong> {icon name="next" href="tiki-user_preferences.php?cookietab=2"}{/if})</em>
 								</td>
 							</tr>
 							<tr><td colspan="4">

Modified: branches/14.x/templates/tiki-webmail_contacts.tpl
===================================================================
--- branches/14.x/templates/tiki-webmail_contacts.tpl	2015-06-29 00:24:40 UTC (rev 55792)
+++ branches/14.x/templates/tiki-webmail_contacts.tpl	2015-06-29 00:25:23 UTC (rev 55793)
@@ -48,8 +48,8 @@
 										{$channels[user].email}
 									</a>
 									[&nbsp;&nbsp;
-									<a class="link" href="tiki-webmail_contacts.php?element={$element}&amp;section=contacts&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;find={$find}&amp;remove={$channels[user].contactId}" title="{tr}Delete{/tr}">
-										{icon _id='cross' alt="{tr}Delete{/tr}"}
+									<a class="link tips" href="tiki-webmail_contacts.php?element={$element}&amp;section=contacts&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;find={$find}&amp;remove={$channels[user].contactId}" title=":{tr}Delete{/tr}">
+										{icon name='delete'}
 									</a>
 									&nbsp;&nbsp;]
 								</td>

Modified: branches/14.x/templates/user_registration.tpl
===================================================================
--- branches/14.x/templates/user_registration.tpl	2015-06-29 00:24:40 UTC (rev 55792)
+++ branches/14.x/templates/user_registration.tpl	2015-06-29 00:25:23 UTC (rev 55793)
@@ -55,7 +55,7 @@
 		<h1>{tr}Your OpenID identity is valid{/tr}</h1>
 		<p>{tr}However, no account is associated to the OpenID identifier.{/tr}</p>
 	{/if}
-	<div class="alert alert-warning" id="divRegCapson" style="display: none;">{icon _id=error style="vertical-align:middle"} {tr}CapsLock is on.{/tr}</div>
+	<div class="alert alert-warning" id="divRegCapson" style="display: none;">{icon name='error' style="vertical-align:middle"} {tr}CapsLock is on.{/tr}</div>
 	{if $allowRegister eq 'y'}
 		<div class="row">
 			{if $userTrackerData}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.