Changed attribute order
authorAlexander Ebert <ebert@woltlab.com>
Fri, 21 Oct 2011 13:20:39 +0000 (15:20 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 21 Oct 2011 13:20:39 +0000 (15:20 +0200)
ID should always be the first element, followed by all other attributes, the last element should be "class". Metadata (data-* attributes) should always be appended to the end of all attributes, thus after "class" and before the closing tag.

wcfsetup/install/files/acp/templates/cacheList.tpl
wcfsetup/install/files/acp/templates/cronjobList.tpl
wcfsetup/install/files/acp/templates/header.tpl
wcfsetup/install/files/acp/templates/option.tpl
wcfsetup/install/files/acp/templates/optionTypeBoolean.tpl
wcfsetup/install/files/acp/templates/optionTypeRadiobuttons.tpl
wcfsetup/install/files/acp/templates/updateServerList.tpl
wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
wcfsetup/install/files/acp/templates/userGroupAdd.tpl
wcfsetup/install/files/acp/templates/userGroupList.tpl
wcfsetup/install/files/acp/templates/userList.tpl

index 46f6373d221b9474d3608021d75ccc9683a1d009..57a4adc904206df71023faf24f8a44a07f962448 100644 (file)
@@ -61,7 +61,7 @@
        {counter name=cacheIndex assign=cacheIndex print=false start=0}
        {if $files|count}
                <div class="border boxTitle">
-                       <a data-isOpen="1" data-collapsibleContainer="cache{@$cacheIndex}" class="collapsible"><img src="{@RELATIVE_WCF_DIR}icon/opened2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="balloonTooltip" /></a>
+                       <a class="collapsible" data-isOpen="1" data-collapsibleContainer="cache{@$cacheIndex}"><img src="{@RELATIVE_WCF_DIR}icon/opened2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="balloonTooltip" /></a>
                        <hgroup>
                                <h1>{$cache} <span class="badge" title="{lang}wcf.acp.cache.data.files.count{/lang}">{#$files|count}</span></h1>
                        </hgroup>
index cf839a0a3ef2c0cfe4c4a2867eb711f4c9e8581f..628cea433c235544551fedbdf61afabf83206601 100644 (file)
                                                <tr class="cronjobRow">
                                                        <td class="columnIcon">
                                                                {if $__wcf->session->getPermission('admin.system.cronjob.canEditCronjob')}
-                                                                       <img src="{@RELATIVE_WCF_DIR}icon/run1.svg" alt="" title="{lang}wcf.acp.cronjob.execute{/lang}" data-objectID="{@$cronjob->cronjobID}" class="executeButton balloonTooltip" />
+                                                                       <img src="{@RELATIVE_WCF_DIR}icon/run1.svg" alt="" title="{lang}wcf.acp.cronjob.execute{/lang}" class="executeButton balloonTooltip" data-objectID="{@$cronjob->cronjobID}" />
                                                                {else}
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/run1D.svg" alt="" title="{lang}wcf.acp.cronjob.execute{/lang}" />
                                                                {/if}
                                                
                                                                {if $cronjob->canBeDisabled()}
-                                                                       <img src="{@RELATIVE_WCF_DIR}icon/{if $cronjob->active}enabled{else}disabled{/if}1.svg" alt="" data-objectID="{@$cronjob->cronjobID}" data-disableMessage="{lang}wcf.global.button.disable{/lang}" data-enableMessage="{lang}wcf.global.button.enable{/lang}" title="{lang}wcf.global.button.{if $cronjob->active}disable{else}enable{/if}{/lang}" class="toggleButton balloonTooltip" />
+                                                                       <img src="{@RELATIVE_WCF_DIR}icon/{if $cronjob->active}enabled{else}disabled{/if}1.svg" alt="" title="{lang}wcf.global.button.{if $cronjob->active}disable{else}enable{/if}{/lang}" class="toggleButton balloonTooltip" data-objectID="{@$cronjob->cronjobID}" data-disableMessage="{lang}wcf.global.button.disable{/lang}" data-enableMessage="{lang}wcf.global.button.enable{/lang}" />
                                                                {else}
                                                                        {if $cronjob->active}
                                                                                <img src="{@RELATIVE_WCF_DIR}icon/enabled1D.svg" alt="" title="{lang}wcf.global.button.disable{/lang}" />
@@ -93,7 +93,7 @@
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/edit1D.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" />
                                                                {/if}
                                                                {if $cronjob->isDeletable()}
-                                                                       <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" data-objectID="{@$cronjob->cronjobID}" data-confirmMessage="{lang}wcf.acp.cronjob.delete.sure{/lang}" title="{lang}wcf.global.button.delete{/lang}" class="deleteButton balloonTooltip" />
+                                                                       <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="deleteButton balloonTooltip" data-objectID="{@$cronjob->cronjobID}" data-confirmMessage="{lang}wcf.acp.cronjob.delete.sure{/lang}" />
                                                                {else}
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" />
                                                                {/if}
index cc173e6db363297dba95169f7d8c33976fdc6846..d19e3be367cf51f786946c297c8de4360e7e1607 100644 (file)
                                        {* work-around for unknown core-object during WCFSetup *}
                                        {if PACKAGE_ID}
                                                {foreach from=$__wcf->getACPMenu()->getMenuItems('') item=parentMenuItem}
-                                                       <div class="menuContainer" data-parentMenuItem="{$parentMenuItem->menuItem}" id="{$parentMenuItem->menuItem}-container" style="display: none;">
+                                                       <div id="{$parentMenuItem->menuItem}-container" style="display: none;" class="menuContainer" data-parentMenuItem="{$parentMenuItem->menuItem}">
                                                                {foreach from=$__wcf->getACPMenu()->getMenuItems($parentMenuItem->menuItem) item=menuItem}
-                                                                       <h1 data-menuItem="{$menuItem->menuItem}" class="menuHeader">{lang}{@$menuItem->menuItem}{/lang}</h1>
+                                                                       <h1 class="menuHeader" data-menuItem="{$menuItem->menuItem}">{lang}{@$menuItem->menuItem}{/lang}</h1>
                                                                        <div class="sidebarMenuGroup">
                                                                                <ul id="{$menuItem->menuItem}">
                                                                                        {foreach from=$__wcf->getACPMenu()->getMenuItems($menuItem->menuItem) item=menuItemCategory}
                                                                                                {if $__wcf->getACPMenu()->getMenuItems($menuItemCategory->menuItem)|count > 0}
                                                                                                        {foreach from=$__wcf->getACPMenu()->getMenuItems($menuItemCategory->menuItem) item=subMenuItem}
-                                                                                                               <li data-menuItem="{$subMenuItem->menuItem}" id="{$subMenuItem->menuItem}"><a href="{$subMenuItem->getLink()}">{lang}{$subMenuItem->menuItem}{/lang}</a></li>
+                                                                                                               <li id="{$subMenuItem->menuItem}" data-menuItem="{$subMenuItem->menuItem}"><a href="{$subMenuItem->getLink()}">{lang}{$subMenuItem->menuItem}{/lang}</a></li>
                                                                                                        {/foreach}
                                                                                                {else}
-                                                                                                       <li data-menuItem="{$menuItemCategory->menuItem}" id="{$menuItemCategory->menuItem}"><a href="{$menuItemCategory->getLink()}">{lang}{$menuItemCategory->menuItem}{/lang}</a></li>
+                                                                                                       <li id="{$menuItemCategory->menuItem}" data-menuItem="{$menuItemCategory->menuItem}"><a href="{$menuItemCategory->getLink()}">{lang}{$menuItemCategory->menuItem}{/lang}</a></li>
                                                                                                {/if}
                                                                                        {/foreach}
                                                                                </ul>
index 48cfe4f184166ebc70438be6d05ee061b00c9dcb..c387f1fd7908f78081e1438b2ae4b31834ab7360 100644 (file)
@@ -26,7 +26,7 @@
 {/if}
 
 <form method="post" action="{link controller='Option' id=$category->categoryID}{/link}">
-       <div data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem" class="tabMenuContainer">
+       <div class="tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
                <nav class="tabMenu">
                        <ul>
                                {foreach from=$optionTree item=categoryLevel1}
index e7e6c6fba72887d6720b44726612eb49ca86acff..c06ce09106f56a7f23f8a9145582d7e3b28d046e 100644 (file)
@@ -1 +1 @@
-<input type="checkbox" id="{$option->optionName}" {if $value} checked="checked"{/if} {if $disableOptions || $enableOptions}class="enablesOptions" data-disableOptions="[ {@$disableOptions}]" data-enableOptions="[ {@$enableOptions}]" {/if} name="values[{$option->optionName}]" value="1" />
\ No newline at end of file
+<input type="checkbox" id="{$option->optionName}" {if $value} checked="checked"{/if} name="values[{$option->optionName}]" value="1" {if $disableOptions || $enableOptions}class="enablesOptions" data-disableOptions="[ {@$disableOptions}]" data-enableOptions="[ {@$enableOptions}]" {/if} />
index 24d232b03f674736aba83c6ce3d8280c2f297c39..594889564d41612ec2c3a206b9c04401ef510865 100644 (file)
@@ -2,8 +2,8 @@
        <dl>
                {foreach from=$selectOptions key=key item=selectOption}
                        <dd>
-                               <label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}data-disableOptions="[ {@$disableOptions[$key]}]" data-enableOptions="[ {@$enableOptions[$key]}]" class="enablesOptions"{/if} /> {lang}{@$selectOption}{/lang}</label>
+                               <label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="enablesOptions" data-disableOptions="[ {@$disableOptions[$key]}]" data-enableOptions="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
                        </dd>
                {/foreach}
        </dl>
-</fieldset>
\ No newline at end of file
+</fieldset>
index d4fa1c2184febb9df37e79ecd75bcabd61f75e1c..29172c1d05a3373d20f6458787c117d17f141b59 100644 (file)
@@ -53,9 +53,9 @@
                                        {foreach from=$objects item=updateServer}
                                                <tr class="updateServerRow">
                                                        <td class="columnIcon">
-                                                               <img src="{@RELATIVE_WCF_DIR}icon/{if !$updateServer->disabled}enabled{else}disabled{/if}1.svg" alt="" title="{lang}wcf.global.button.{if !$updateServer->disabled}disable{else}enable{/if}{/lang}" data-objectID="{@$updateServer->packageUpdateServerID}" data-disableMessage="{lang}wcf.global.button.disable{/lang}" data-enableMessage="{lang}wcf.global.button.enable{/lang}" class="toggleButton balloonTooltip" />
+                                                               <img src="{@RELATIVE_WCF_DIR}icon/{if !$updateServer->disabled}enabled{else}disabled{/if}1.svg" alt="" title="{lang}wcf.global.button.{if !$updateServer->disabled}disable{else}enable{/if}{/lang}" class="toggleButton balloonTooltip" data-objectID="{@$updateServer->packageUpdateServerID}" data-disableMessage="{lang}wcf.global.button.disable{/lang}" data-enableMessage="{lang}wcf.global.button.enable{/lang}" />
                                                                <a href="{link controller='UpdateServerEdit' id=$updateServer->packageUpdateServerID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
-                                                               <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" data-objectID="{@$updateServer->packageUpdateServerID}" data-confirmMessage="{lang}wcf.acp.updateServer.delete.sure{/lang}" class="deleteButton balloonTooltip" />
+                                                               <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="deleteButton balloonTooltip" data-objectID="{@$updateServer->packageUpdateServerID}" data-confirmMessage="{lang}wcf.acp.updateServer.delete.sure{/lang}" />
                                                        
                                                                {if $additionalButtons[$updateServer->packageUpdateServerID]|isset}{@$additionalButtons[$updateServer->packageUpdateServerID]}{/if}
                                                        </td>
index 7fdb1c61ec17879aa58207872d0f17fe457e2a08..b136a58d6076b44e1eea3b10c7e12bbed17b24a8 100644 (file)
@@ -38,8 +38,8 @@
                                                
                                                <dl>
                                                        <dd><!-- ToDo: Definition List -->
-                                                               <li><label><input type="radio" class="enablesOptions" data-disableOptions="[ ]" data-enableOptions="[ 'separatorDiv', 'textSeparatorDiv' ]" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></li>
-                                                               <li><label><input type="radio" class="enablesOptions" data-disableOptions="[ 'separatorDiv', 'textSeparatorDiv' ]" data-enableOptions="[ ]" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></li>
+                                                               <li><label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}class="enablesOptions" data-disableOptions="[ ]" data-enableOptions="[ 'separatorDiv', 'textSeparatorDiv' ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></li>
+                                                               <li><label><input type="radio" class="enablesOptions" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}data-disableOptions="[ 'separatorDiv', 'textSeparatorDiv' ]" data-enableOptions="[ ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></li>
                                                        </dd>
                                                </dl>
                                        </fieldset>
index a94c72aba0f5cacb8cca71090638ba1456232570..20f53fb55b05243a88a5fc145c198116b40c7f1a 100644 (file)
@@ -78,7 +78,7 @@
                        </nav>
                        
                        {foreach from=$optionTree item=categoryLevel1}
-                               <div id="{@$categoryLevel1[object]->categoryName}" data-active="{$activeTabMenuItem}" data-store="activeSubTabMenuItem" class="tabMenuContainer border tabMenuContent ">
+                               <div id="{@$categoryLevel1[object]->categoryName}" class="tabMenuContainer border tabMenuContent" data-active="{$activeTabMenuItem}" data-store="activeSubTabMenuItem">
                                        <nav class="menu">
                                                <ul>
                                                        {foreach from=$categoryLevel1[categories] item=$categoryLevel2}
index a27a1e64021320e6e95dc49bb99767f50d1b8c9e..ab9ad21b028acd7211e15b9c1f81460e5bd7edec 100644 (file)
@@ -45,7 +45,7 @@
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/edit1D.svg" alt="" title="{lang}wcf.acp.group.edit{/lang}" />
                                                                {/if}
                                                                {if $group->isDeletable()}
-                                                                       <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" data-objectID="{@$group->groupID}" data-confirmMessage="{lang}wcf.acp.group.delete.sure{/lang}" title="{lang}wcf.global.button.delete{/lang}" class="deleteButton balloonTooltip" />
+                                                                       <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="deleteButton balloonTooltip" data-objectID="{@$group->groupID}" data-confirmMessage="{lang}wcf.acp.group.delete.sure{/lang}" />
                                                                {else}
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" />
                                                                {/if}
index e22950923dcd82d9bd0d714411596bd796faebb6..2d4fc4ea9fb1ee3e57ad40f371d409f7713c3809 100644 (file)
@@ -42,7 +42,7 @@
        </nav>
        
        {hascontent}
-               <table data-type="com.woltlab.wcf.user" class="clipboardContainer">
+               <table class="clipboardContainer" data-type="com.woltlab.wcf.user">
                        <thead>
                                <tr class="tableHead">
                                        <th class="columnMark"><label><input type="checkbox" class="clipboardMarkAll" /></label></th>
@@ -95,7 +95,7 @@
        <div class="contentFooter">
                {@$pagesLinks}
                
-               <div data-types="[ 'com.woltlab.wcf.user' ]" class="clipboardEditor"></div>
+               <div class="clipboardEditor" data-types="[ 'com.woltlab.wcf.user' ]"></div>
                
                <nav class="largeButtons">
                        <ul>