From: Luzifr <szekely@woltlab.com>
Date: Fri, 27 Jan 2012 19:48:55 +0000 (+0100)
Subject: Multiple changes
X-Git-Tag: 2.0.0_Beta_1~1377^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2cb78b74d607a31b97b44e51d4293b40c1c1b32f;p=GitHub%2FWoltLab%2FWCF.git

Multiple changes

Fixes wcfUrl-display at installation; Again one "button" fixed; Removed
the string "subTab" from that function-name, as already announced to
Alex! Those menus will not be called "subTabMenu" again. Maybe there
will be a new name; Began adding the prefix "js" to
Javascrip-only-classes. Sorry Alex, but this is much better readable &
understandable for non-developers. Of course, adding the suffix "JS"
would also be possible. Please implement that everywhere!
---

diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css
index eb59bf400b..6e9239c2a0 100644
--- a/wcfsetup/install/files/acp/style/wcf.css
+++ b/wcfsetup/install/files/acp/style/wcf.css
@@ -1906,12 +1906,19 @@ dl > dd > fieldset > dl > dd > label {
 
 .wcfDialogContainer dl > dd {
 	margin-left: 150px;
-}	
+}
+
 .wcfDialogContainer dl > .reversed {
 	left: 170px;
 	width: auto;
 }
 
+/* Special -> Installation */
+
+dl.wcfUrlContainer > dd.wcfUrl > p {
+	margin-top: 5px;
+}
+
 
 /* ############## Forms ############## */
 
@@ -3391,18 +3398,17 @@ tr .columnURL {
 }
 
 
-/* ############## System Notifications (Sheet) ############## */
 
-/* Globals */
+/* ############## ToDo: System Notifications (Sheet) ############## */
 
-.systemNotification {
-	/* declarations taken from .success */
+/* Globals */
 
-	background-color: rgba(238, 255, 238, 1.0);
-	border: 1px solid rgba(0, 204, 0, 1.0);
+.systemNotification { /* declarations taken from .success */
+	background-color: rgba(238, 255, 238, 1);
+	border: 1px solid rgba(0, 204, 0, 1);
 	border-top-width: 0;
 	border-radius: 0 0 5px 5px;
-	color: rgba(0, 153, 0, 1.0);
+	color: rgba(0, 153, 0, 1);
 	left: 40%;
 	padding: 14px;
 	padding-top: 10px;
@@ -3420,7 +3426,7 @@ tr .columnURL {
 }
 
 .systemNotification.open {
-	top: 0px;
+	top: 0;
 }
 
 
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index e3305a26cf..37e76f0a1d 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -69,7 +69,7 @@
 		
 		{event name='fieldsets'}
 		
-		<div class="tabMenuContainer" data-active="{$activeSubTabMenuItem}" data-store="activeTabMenuItem">
+		<div class="tabMenuContainer" data-active="{$activeMenuItem}" data-store="activeTabMenuItem">
 			<nav class="tabMenu">
 				<ul>
 					{foreach from=$optionTree item=categoryLevel1}
@@ -79,7 +79,7 @@
 			</nav>
 			
 			{foreach from=$optionTree item=categoryLevel1}
-				<div id="{@$categoryLevel1[object]->categoryName}" class="tabMenuContainer border tabMenuContent" data-active="{$activeTabMenuItem}" data-store="activeSubTabMenuItem">
+				<div id="{@$categoryLevel1[object]->categoryName}" class="tabMenuContainer border tabMenuContent" data-active="{$activeTabMenuItem}" data-store="activeMenuItem">
 					<nav class="menu">
 						<ul>
 							{foreach from=$categoryLevel1[categories] item=$categoryLevel2}
@@ -126,7 +126,7 @@
  		<input type="hidden" name="action" value="{@$action}" />
  		{if $groupID|isset}<input type="hidden" name="id" value="{@$groupID}" />{/if}
  		<input type="hidden" id="activeTabMenuItem" name="activeTabMenuItem" value="{$activeTabMenuItem}" />
- 		<input type="hidden" id="activeSubTabMenuItem" name="activeSubTabMenuItem" value="{$activeSubTabMenuItem}" />
+ 		<input type="hidden" id="activeMenuItem" name="activeMenuItem" value="{$activeMenuItem}" />
  	</div>
 </form>
 
diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index 1b7585b76c..e9b0050ee6 100644
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -3,7 +3,7 @@
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
-		new WCF.Action.Delete('wcf\\data\\user\\group\\UserGroupAction', $('.userGroupRow'));
+		new WCF.Action.Delete('wcf\\data\\user\\group\\UserGroupAction', $('.jsUserGroupRow'));
 	});
 	//]]>
 </script>
@@ -19,7 +19,7 @@
 	{pages print=true assign=pagesLinks controller="UserGroupList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
 	<nav>
 		<ul class="largeButtons">
-			<li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+			<li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}" class="button"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
 			
 			{event name='largeButtons'}
 		</ul>
@@ -46,7 +46,7 @@
 			<tbody>
 				{content}
 					{foreach from=$objects item=group}
-						<tr id="groupContainer{@$group->groupID}" class="userGroupRow">
+						<tr id="groupContainer{@$group->groupID}" class="jsUserGroupRow">
 							<td class="columnIcon">
 								{if $group->isEditable()}
 									<a href="{link controller='UserGroupEdit' id=$group->groupID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
@@ -78,7 +78,7 @@
 		{@$pagesLinks}
 		<nav>
 			<ul class="largeButtons">
-				<li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+				<li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}" class="button"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
 				
 				{event name='largeButtons'}
 			</ul>
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
index e234d52798..97bff7ae74 100755
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
@@ -54,7 +54,7 @@ class UserGroupAddForm extends AbstractOptionListForm {
 	 * active sub tab menu item name
 	 * @var string
 	 */
-	public $activeSubTabMenuItem = '';
+	public $activeMenuItem = '';
 	
 	/**
 	 * the option tree
@@ -109,7 +109,7 @@ class UserGroupAddForm extends AbstractOptionListForm {
 		
 		if (I18nHandler::getInstance()->isPlainValue('groupName')) $this->groupName = I18nHandler::getInstance()->getValue('groupName');
 		if (isset($_POST['activeTabMenuItem'])) $this->activeTabMenuItem = $_POST['activeTabMenuItem'];
-		if (isset($_POST['activeSubTabMenuItem'])) $this->activeSubTabMenuItem = $_POST['activeSubTabMenuItem'];
+		if (isset($_POST['activeMenuItem'])) $this->activeMenuItem = $_POST['activeMenuItem'];
 	}
 	
 	/**
@@ -207,7 +207,7 @@ class UserGroupAddForm extends AbstractOptionListForm {
 			'optionTree' => $this->optionTree,
 			'action' => 'add',
 			'activeTabMenuItem' => $this->activeTabMenuItem,
-			'activeSubTabMenuItem' => $this->activeSubTabMenuItem
+			'activeMenuItem' => $this->activeMenuItem
 		));
 	}