Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

2 files changed, 78 insertions, 78 deletions

diff --git a/public/media/css/style.css b/public/media/css/style.css
index 0cfb17a..b9e56f4 100644
--- a/public/media/css/style.css
+++ b/public/media/css/style.css
@@ -34,11 +34,10 @@ body {
 
 #sidepannel {
 	float: left;
-	font-size:12px;
+	font-size: 12px;
 }
 
-
-#footer {	
+#footer {
 	margin: 0;
 	clear: both;
 	bottom: 0px;
@@ -113,8 +112,8 @@ body {
 #content {
 	padding: 10px;
 	font-size: 13px;
-	min-height:400px;
-	background-color:#F2F3F1;
+	min-height: 400px;
+	background-color: #F2F3F1;
 }
 
 #debug {
@@ -144,37 +143,35 @@ body {
 	width: 160px;
 	padding: 0;
 	margin: 0 0 21px 0;
-    background-color: #ffffff;
-    border-bottom: none;
+	background-color: #ffffff;
+	border-bottom: none;
 	overflow: hidden;
-	}
+}
 
 .portletNavigationTree .portletItem {
-    border-left: none;
-    border-right: none;
-    }
+	border-left: none;
+	border-right: none;
+}
 
 .portletNavigationTree dt {
 	display: none;
-	}
+}
 
-.portletNavigationTree ul, 
-.portletNavigationTree ul li,
-.portletNavigationTree dd,
-.portletNavigationTree div {
+.portletNavigationTree ul,.portletNavigationTree ul li,.portletNavigationTree dd,.portletNavigationTree div
+	{
 	margin: 0;
 	padding: 0;
-	}
+}
 
 .portletNavigationTree ul li {
 	margin: 0;
 	border-bottom: 1px solid #fff;
 	list-style: none;
-	}
+}
 
 .portletNavigationTree ul li.navTreeLastItem {
-    border-bottom: none;
-    }
+	border-bottom: none;
+}
 
 .portletNavigationTree li.navTreeItem a {
 	display: block;
@@ -184,100 +181,98 @@ body {
 	text-decoration: none;
 	color: #363534;
 	background: #c9cac8;
-	}
-
+}
 
 /* - navTreeLevel0 - */
 .portletNavigationTree ul.navTreeLevel0 a {
-    padding-left: 4px;
-    }
+	padding-left: 4px;
+}
 
 .portletNavigationTree ul.navTreeLevel0 a:hover {
-    background: #004a99;
-    color: #fff;
-    }
+	background: #004a99;
+	color: #fff;
+}
 
 .portletNavigationTree ul.navTreeLevel0 a.navTreeCurrentItem {
 	background: #004a99 !important;
 	color: #fff;
 	margin-left: 0px;
 	padding-left: 4px;
-	}
+}
 
 .portletNavigationTree ul.navTreeLevel0 li {
-    background: url(/media/img/navigationLevel0.gif) repeat-y left top #c9cac8;
-    padding-left: 4px;
-    }
-
+	background: url(/media/img/navigationLevel0.gif) repeat-y left top
+		#c9cac8;
+	padding-left: 4px;
+}
 
 /* - navTreeLevel1 - */
 .portletNavigationTree ul.navTreeLevel1 {
-   /* border-top: 1px solid #fff; */
-    margin: 0 0 0 0px;
-    }
+	/* border-top: 1px solid #fff; */
+	margin: 0 0 0 0px;
+}
 
 .portletNavigationTree ul.navTreeLevel1 a {
 	background: #d5d6d2;
 	color: #363534;
 	padding-left: 4px;
-	}
+}
 
 .portletNavigationTree ul.navTreeLevel1 a:hover {
 	background: #2a6ebb;
 	color: #fff;
-	}
+}
 
 .portletNavigationTree ul.navTreeLevel1 li {
-    background: url(/media/img/navigationLevel1.gif) repeat-y 0px top;
-    }
+	background: url(/media/img/navigationLevel1.gif) repeat-y 0px top;
+}
 
 .portletNavigationTree ul.navTreeLevel1 a.navTreeCurrentItem {
 	background: #2a6ebb !important;
 	color: #fff;
 	margin-left: 0px;
-	}
+}
 
 .portletNavigationTree ul.navTreeLevel1 li.navTreeLastItem {
-    border-bottom: none;
-    }
-
+	border-bottom: none;
+}
 
 /* - navTreeLevel2 - */
 .portletNavigationTree ul.navTreeLevel2 {
-    border-top: 1px solid #fff;
-    margin: 0;
-    }
+	border-top: 1px solid #fff;
+	margin: 0;
+}
 
 .portletNavigationTree ul.navTreeLevel2 a {
 	background: #e0e1dd;
 	margin-left: 0px;
 	padding-left: 4px;
-	}
+}
 
 .portletNavigationTree ul.navTreeLevel2 a:hover {
 	background: #6f9ad3;
 	color: #fff;
-	}
+}
 
 .portletNavigationTree ul.navTreeLevel2 li {
-    background: url(/media/img/navigationLevel2.gif) repeat-y left top;
-    }
+	background: url(/media/img/navigationLevel2.gif) repeat-y left top;
+}
 
 .portletNavigationTree ul.navTreeLevel2 li.navTreeLastItem {
-    border: none;
-    }
+	border: none;
+}
 
 .portletNavigationTree ul.navTreeLevel2 a.navTreeCurrentItem {
 	background: #6f9ad3 !important;
 	color: #fff !important;
-	}
+}
 
 .portletNavigationTree ul.navTreeLevel2 a.navTreeItemInPath {
 	background: #6f9ad3 !important;
 	color: #fff !important;
-	}
-/* ################################################### */
+}
 
+/* ################################################### */
 #content h1 {
 	display: block;
 	text-align: center;
@@ -303,13 +298,15 @@ td {
 	font-size: 12px;
 	border: 1px solid #CCC;
 }
-.updatebutton, .addbutton {
+
+.updatebutton,.addbutton {
 	float: right;
 }
 
 .updatebutton:before {
 	content: url(/media/img/update.png) ' ';
 }
+
 .addbutton:before {
 	content: url(/media/img/create.png) ' ';
 }
@@ -329,14 +326,6 @@ td {
 	background-color: #FFF5CC;
 }
 
-tr.selectedMembership {
-	background-color: red;
-}
-
-tr.selectedMembership td {
-	padding-left: 3px;
-}
-
 .monospace {
 	font-family: Courier New, monospace;
 }
@@ -435,4 +424,4 @@ td.action img {
 	background: #FFFFFF url('/media/img/box_info.png') no-repeat;
 	background-position: 10px center;
 	color: #777;
-}
+}
\ No newline at end of file
diff --git a/public/media/css/user.css b/public/media/css/user.css
index 24e830e..00d144a 100644
--- a/public/media/css/user.css
+++ b/public/media/css/user.css
@@ -1,19 +1,30 @@
-.dashboard ul{
-	padding:0px;
+.dashboard ul {
+	padding: 0px;
 }
-.dashboard li{
-	list-style:none;
-	border:1px solid black;
+
+.dashboard li {
+	list-style: none;
+	border: 1px solid black;
 	-moz-border-radius: 1em 4em 1em 4em;
 	border-radius: 1em 4em 1em 4em;
-	padding:10px 40px;
-	margin:10px;
-	background-color:#FFF;
+	padding: 10px 40px;
+	margin: 10px;
+	background-color: #FFF;
 }
-.dashboard a{
-	color:#000;
-	text-decoration:none;
+
+.dashboard a {
+	color: #000;
+	text-decoration: none;
 }
-.dashboard .bottomimg{
-	text-align:center;
+
+.dashboard .bottomimg {
+	text-align: center;
 }
+
+tr.selectedEntry {
+	background-color: red;
+}
+
+tr.selectedEntry td {
+	padding-left: 3px;
+}
\ No newline at end of file