Icon overhaul / new icon naming scheme

diff --git a/acptemplates/languageAdd.tpl b/acptemplates/languageAdd.tpl
index 0ebd87f69299c6c826eb0e48a10b760cb3bf8786..a50236e371e26e7ffb9163e0d70adb39ddcd37d0 100644 (file)
--- a/acptemplates/languageAdd.tpl
+++ b/acptemplates/languageAdd.tpl
@@ -26,7 +26,7 @@
 <div class="contentNavigation">
        <nav>
                <ul>
-                       <li><a href="{link controller='LanguageList'}{/link}" title="{lang}wcf.acp.menu.link.language.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/language1.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
+                       <li><a href="{link controller='LanguageList'}{/link}" title="{lang}wcf.acp.menu.link.language.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
                </ul>
        </nav>
 </div>

diff --git a/acptemplates/languageExport.tpl b/acptemplates/languageExport.tpl
index 5c58dc4ea4f48a0055d325faa11cd50143a90631..43613026caed77f230eb7471d4f129b4264847df 100644 (file)
--- a/acptemplates/languageExport.tpl
+++ b/acptemplates/languageExport.tpl
@@ -17,7 +17,7 @@
 <div class="contentNavigation">
        <nav>
                <ul>
-                       <li><a href="{link controller='LanguageList'}{/link}" title="{lang}wcf.acp.menu.link.language.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/language1.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
+                       <li><a href="{link controller='LanguageList'}{/link}" title="{lang}wcf.acp.menu.link.language.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
                </ul>
        </nav>
 </div>

diff --git a/acptemplates/languageList.tpl b/acptemplates/languageList.tpl
index 4135c41dd04615a54788ea953ed36e1287baaedc..a4031eca0098ae2c1f02573df241217b70be0181 100644 (file)
--- a/acptemplates/languageList.tpl
+++ b/acptemplates/languageList.tpl
@@ -14,12 +14,12 @@
                                        var $button = $(row).find('.jsSetAsDefaultButton');
                                        
                                        if (WCF.inArray($($button).data('objectID'), data.objectIDs)) {
-                                               $($button).attr('src', '{@$__wcf->getPath()}icon/default1D.svg');
-                                               $(row).find('.jsDeleteButton').attr('src', '{@$__wcf->getPath()}icon/delete1D.svg');
+                                               $($button).attr('src', '{@$__wcf->getPath()}icon/default.svg');
+                                               $(row).find('.jsDeleteButton').attr('src', '{@$__wcf->getPath()}icon/delete.svg');
                                        }
                                        else {
                                                $($button).attr('src', '{@$__wcf->getPath()}icon/default1.svg');
-                                               $(row).find('.jsDeleteButton').attr('src', '{@$__wcf->getPath()}icon/delete1.svg');
+                                               $(row).find('.jsDeleteButton').attr('src', '{@$__wcf->getPath()}icon/delete.svg');
                                        }
                                });
                        }
@@ -40,7 +40,7 @@
        {if $__wcf->getSession()->getPermission('admin.language.canAddLanguage')}
                <nav>
                        <ul>
-                               <li><a href="{link controller='LanguageAdd'}{/link}" title="{lang}wcf.acp.language.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add1.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
+                               <li><a href="{link controller='LanguageAdd'}{/link}" title="{lang}wcf.acp.language.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
                                
                                {event name='largeButtons'}
                        </ul>
@@ -70,34 +70,34 @@
                                <tr class="jsLanguageRow">
                                        <td class="columnIcon">
                                                {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
-                                                       <a href="{link controller='LanguageExport' id=$language->languageID}{/link}"><img src="{@$__wcf->getPath()}icon/download1.svg" alt="" title="{lang}wcf.acp.language.export{/lang}" class="icon16 jsTooltip" /></a>
+                                                       <a href="{link controller='LanguageExport' id=$language->languageID}{/link}"><img src="{@$__wcf->getPath()}icon/download.svg" alt="" title="{lang}wcf.acp.language.export{/lang}" class="icon16 jsTooltip" /></a>
                                                {else}
-                                                       <img src="{@$__wcf->getPath()}icon/download1D.svg" alt="" title="{lang}wcf.acp.language.export{/lang}" class="icon16" />
+                                                       <img src="{@$__wcf->getPath()}icon/download.svg" alt="" title="{lang}wcf.acp.language.export{/lang}" class="icon16 disabloed" />
                                                {/if}
                                                
                                                {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
                                                        {if !$language->isDefault}
-                                                               <img src="{@$__wcf->getPath()}icon/default1.svg" alt="" title="{lang}wcf.acp.language.setAsDefault{/lang}" class="icon16 jsSetAsDefaultButton jsTooltip" data-object-id="{@$language->languageID}" />
+                                                               <img src="{@$__wcf->getPath()}icon/default.svg" alt="" title="{lang}wcf.acp.language.setAsDefault{/lang}" class="icon16 jsSetAsDefaultButton jsTooltip" data-object-id="{@$language->languageID}" />
                                                        {else}
-                                                               <img src="{@$__wcf->getPath()}icon/default1D.svg" alt="" title="{lang}wcf.acp.language.setAsDefault{/lang}" class="icon16" />
+                                                               <img src="{@$__wcf->getPath()}icon/default.svg" alt="" title="{lang}wcf.acp.language.setAsDefault{/lang}" class="icon16 disabled" />
                                                        {/if}
                                                {else}
-                                                       <img src="{@$__wcf->getPath()}icon/default1D.svg" alt="" title="{lang}wcf.acp.language.setAsDefault{/lang}" class="icon16" />
+                                                       <img src="{@$__wcf->getPath()}icon/default.svg" alt="" title="{lang}wcf.acp.language.setAsDefault{/lang}" class="icon16 disabled" />
                                                {/if}
                                                
                                                {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
-                                                       <a href="{link controller='LanguageEdit' id=$language->languageID}{/link}"><img src="{@$__wcf->getPath()}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 jsTooltip" /></a>
+                                                       <a href="{link controller='LanguageEdit' id=$language->languageID}{/link}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 jsTooltip" /></a>
                                                {else}
-                                                       <img src="{@$__wcf->getPath()}icon/edit1D.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16" />
+                                                       <img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 disabled" />
                                                {/if}
                                                {if $__wcf->getSession()->getPermission('admin.language.canDeleteLanguage')}
                                                        {if !$language->isDefault}
-                                                               <img src="{@$__wcf->getPath()}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsTooltip jsDeleteButton" data-object-id="{@$language->languageID}" data-confirmMessage="{lang}wcf.acp.language.delete.sure{/lang}" />
+                                                               <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsTooltip jsDeleteButton" data-object-id="{@$language->languageID}" data-confirmMessage="{lang}wcf.acp.language.delete.sure{/lang}" />
                                                        {else}
-                                                               <img src="{@$__wcf->getPath()}icon/delete1D.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16" />
+                                                               <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
                                                        {/if}
                                                {else}
-                                                       <img src="{@$__wcf->getPath()}icon/delete1D.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16" />
+                                                       <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
                                                {/if}
                                        </td>
                                        <td class="columnID columnLanguageID">{@$language->languageID}</td>
@@ -123,7 +123,7 @@
                {if $__wcf->getSession()->getPermission('admin.language.canAddLanguage')}
                        <nav>
                                <ul>
-                                       <li><a href="{link controller='LanguageAdd'}{/link}" title="{lang}wcf.acp.language.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add1.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
+                                       <li><a href="{link controller='LanguageAdd'}{/link}" title="{lang}wcf.acp.language.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
                                        
                                        {event name='largeButtons'}
                                </ul>

diff --git a/acptemplates/languageServerAdd.tpl b/acptemplates/languageServerAdd.tpl
index daac32ef78e724c769a8ad46b613be831b536d3f..7f95a83aa23b975ec366389b7f995a22df5aa2a0 100644 (file)
--- a/acptemplates/languageServerAdd.tpl
+++ b/acptemplates/languageServerAdd.tpl
@@ -17,7 +17,7 @@
 <div class="contentNavigation">
        <nav>
                <ul>
-                       <li><a href="{link controller='LanguageServerList'}{/link}" title="{lang}wcf.acp.menu.link.package.server.view{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/language1.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.package.server.view{/lang}</span></a></li>
+                       <li><a href="{link controller='LanguageServerList'}{/link}" title="{lang}wcf.acp.menu.link.package.server.view{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.package.server.view{/lang}</span></a></li>
                </ul>
        </nav>
 </div>

diff --git a/acptemplates/languageServerList.tpl b/acptemplates/languageServerList.tpl
index c1c0e53c33cf11949f169458aeec1dedca8e8c77..3ecfbf55b1e2b9e657d0cc4ab20b63c395a6ee71 100644 (file)
--- a/acptemplates/languageServerList.tpl
+++ b/acptemplates/languageServerList.tpl
@@ -21,7 +21,7 @@
        {if $__wcf->getSession()->getPermission('admin.language.canAddServer')}
                <nav>
                        <ul>
-                               <li><a href="{link controller='LanguageServerAdd'}{/link}" title="{lang}wcf.acp.languageServer.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add1.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.languageServer.add{/lang}</span></a></li>
+                               <li><a href="{link controller='LanguageServerAdd'}{/link}" title="{lang}wcf.acp.languageServer.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.languageServer.add{/lang}</span></a></li>
                                
                                {event name='largeButtons'}
                        </ul>
@@ -49,17 +49,17 @@
                                        <tr class="jsLanguageServerRow">
                                                <td class="columnIcon">
                                                        {if $__wcf->getSession()->getPermission('admin.language.canEditServer')}
-                                                               <img src="{@$__wcf->getPath()}icon/{if !$languageServer->disabled}enabled{else}disabled{/if}1.svg" alt="" title="{lang}wcf.global.button.{if !$languageServer->disabled}disable{else}enable{/if}{/lang}" class="icon16 jsToggleButton jsTooltip" data-object-id="{@$languageServer->languageServerID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}" />
-                                                               <a href="{link controller='LanguageServerEdit' id=$languageServer->languageServerID}{/link}"><img src="{@$__wcf->getPath()}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16jsTooltip" /></a>
+                                                               <img src="{@$__wcf->getPath()}icon/{if !$languageServer->disabled}enabled{else}disabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if !$languageServer->disabled}disable{else}enable{/if}{/lang}" class="icon16 jsToggleButton jsTooltip" data-object-id="{@$languageServer->languageServerID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}" />
+                                                               <a href="{link controller='LanguageServerEdit' id=$languageServer->languageServerID}{/link}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16jsTooltip" /></a>
                                                        {else}
-                                                               <img src="{@$__wcf->getPath()}icon/{if !$languageServer->disabled}enabled{else}disabled{/if}1D.svg" alt="" title="{lang}wcf.global.button.{if !$languageServer->disabled}disable{else}enable{/if}{/lang}" class="icon16" />
-                                                               <img src="{@$__wcf->getPath()}icon/edit1D.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16" />
+                                                               <img src="{@$__wcf->getPath()}icon/{if !$languageServer->disabled}enabled{else}disabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if !$languageServer->disabled}disable{else}enable{/if}{/lang}" class="icon16 disabled" />
+                                                               <img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 disabled" />
                                                        {/if}
                                                        
                                                        {if $__wcf->getSession()->getPermission('admin.language.canDeleteServer')}
-                                                               <img src="{@$__wcf->getPath()}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip" data-object-id="{@$languageServer->languageServerID}" data-confirm-message="{lang}wcf.acp.languageServer.delete.sure{/lang}" />
+                                                               <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip" data-object-id="{@$languageServer->languageServerID}" data-confirm-message="{lang}wcf.acp.languageServer.delete.sure{/lang}" />
                                                        {else}
-                                                               <img src="{@$__wcf->getPath()}icon/delete1D.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16" />
+                                                               <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
                                                        {/if}
                                                </td>
                                                <td class="columnID columnLanguageServerID">{@$languageServer->languageServerID}</td>
@@ -82,7 +82,7 @@
                {if $__wcf->getSession()->getPermission('admin.language.canAddServer')}
                        <nav>
                                <ul>
-                                       <li><a href="{link controller='LanguageServerAdd'}{/link}" title="{lang}wcf.acp.languageServer.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add1.svg" alt="" class="icon16" /> <span>{lang}wcf.acp.languageServer.add{/lang}</span></a></li>
+                                       <li><a href="{link controller='LanguageServerAdd'}{/link}" title="{lang}wcf.acp.languageServer.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon16" /> <span>{lang}wcf.acp.languageServer.add{/lang}</span></a></li>
                                        
                                        {event name='largeButtons'}
                                </ul>