From ab891ea67100d34c8395a414d7ffdf9c9d2e9711 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 17 Aug 2016 12:19:42 +0200
Subject: [main] Show submenu as extra row when not in large mode

---
 style/default.css | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'style')

diff --git a/style/default.css b/style/default.css
index 6ae03b6b..d38ca9e0 100644
--- a/style/default.css
+++ b/style/default.css
@@ -491,3 +491,17 @@ li.slx-submenu a {
 nav.navbar.sidebar {
 	color: #eee;
 }
+
+.slx-smallsubmenu > li {
+	display: inline-block;
+}
+
+.slx-smallsubmenu > li + li:before {
+	padding: 0 3px;
+	content: "\2022\00a0";
+	color: #ccc;
+}
+
+.slx-smallsubmenu a {
+	color: #fff;
+}
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 35667fcedba31d809ded2a2c4eb105d75eb2f6f1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 17 Aug 2016 12:30:53 +0200
Subject: Clean up css a bit

---
 modules-available/dozmod/templates/images-delete.html        | 10 +++++-----
 modules-available/dozmod/templates/orglist.html              |  2 +-
 modules-available/dozmod/templates/userlist.html             |  8 ++++----
 modules-available/locations/templates/locations.html         | 12 ++++++------
 modules-available/statistics/templates/clientlist.html       |  2 +-
 modules-available/statistics/templates/kvmstate.html         |  2 +-
 modules-available/statistics/templates/memory.html           |  2 +-
 modules-available/statistics/templates/newclients.html       |  2 +-
 modules-available/sysconfig/templates/custom-filelist.html   |  2 +-
 modules-available/sysconfig/templates/custom-fileselect.html |  2 +-
 modules-available/sysconfig/templates/list-configs.html      |  6 +++---
 modules-available/sysconfig/templates/list-modules.html      |  8 ++++----
 style/default.css                                            | 12 ------------
 13 files changed, 29 insertions(+), 41 deletions(-)

(limited to 'style')

diff --git a/modules-available/dozmod/templates/images-delete.html b/modules-available/dozmod/templates/images-delete.html
index b85d2c06..0ee90835 100644
--- a/modules-available/dozmod/templates/images-delete.html
+++ b/modules-available/dozmod/templates/images-delete.html
@@ -27,11 +27,11 @@
 					<tbody>
 						{{#images}}
 						<tr>
-							<td class="text-left slx-nowrap {{name_extra_class}}">{{displayname}}<br><span class="small">{{imageversionid}}</span></td>
-							<td class="text-left slx-nowrap">{{version}}</td>
-							<td class="text-left slx-nowrap"><a href="mailto:{{email}}">{{lastname}}, {{firstname}}</a></td>
-							<td class="text-left slx-nowrap"><span class="glyphicon {{hasNewerClass}}"></span></td>
-							<td class="text-right slx-nowrap">{{filesize}}</td>
+							<td class="text-left text-nowrap {{name_extra_class}}">{{displayname}}<br><span class="small">{{imageversionid}}</span></td>
+							<td class="text-left text-nowrap">{{version}}</td>
+							<td class="text-left text-nowrap"><a href="mailto:{{email}}">{{lastname}}, {{firstname}}</a></td>
+							<td class="text-left text-nowrap"><span class="glyphicon {{hasNewerClass}}"></span></td>
+							<td class="text-right text-nowrap">{{filesize}}</td>
 							<td><input class="del-check" name="images[{{imageversionid}}]" type="checkbox" {{checked}}></td>
 						</tr>
 						{{/images}}
diff --git a/modules-available/dozmod/templates/orglist.html b/modules-available/dozmod/templates/orglist.html
index bb002b3b..482864de 100644
--- a/modules-available/dozmod/templates/orglist.html
+++ b/modules-available/dozmod/templates/orglist.html
@@ -16,7 +16,7 @@
 				<tbody>
 					{{#organizations}}
 					<tr>
-						<td class="text-left slx-nowrap">{{displayname}}</td>
+						<td class="text-left text-nowrap">{{displayname}}</td>
 						<td class="text-nowrap">
 							<input onclick="seto('setorglogin', this, '{{organizationid}}')" type="checkbox" {{{canlogin}}}>
 						</td>
diff --git a/modules-available/dozmod/templates/userlist.html b/modules-available/dozmod/templates/userlist.html
index 7dd84fd4..93ef7b41 100644
--- a/modules-available/dozmod/templates/userlist.html
+++ b/modules-available/dozmod/templates/userlist.html
@@ -22,10 +22,10 @@
 				<tbody>
 					{{#users}}
 					<tr>
-						<td class="text-left slx-nowrap"><a href="?do=dozmod&amp;section=actionlog&amp;action=showuser&amp;uuid={{userid}}">{{lastname}}, {{firstname}}</a></td>
-						<td class="text-left slx-nowrap">{{orgname}}</td>
-						<td class="text-left slx-nowrap">{{lastlogin}}</td>
-						<td class="text-left slx-nowrap"><a href="mailto:{{email}}">{{email}}</a></td>
+						<td class="text-left text-nowrap"><a href="?do=dozmod&amp;section=actionlog&amp;action=showuser&amp;uuid={{userid}}">{{lastname}}, {{firstname}}</a></td>
+						<td class="text-left text-nowrap">{{orgname}}</td>
+						<td class="text-left text-nowrap">{{lastlogin}}</td>
+						<td class="text-left text-nowrap"><a href="mailto:{{email}}">{{email}}</a></td>
 						<td><input onclick="setu('setmail', this, '{{userid}}')" type="checkbox" {{{emailnotifications}}}></td>
 						<td><input onclick="setu('setsu', this, '{{userid}}')" type="checkbox" {{{issuperuser}}}></td>
 						<td><input onclick="setu('setlogin', this, '{{userid}}')" type="checkbox" {{{canlogin}}}></td>
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html
index bb13131e..5fec2e2e 100644
--- a/modules-available/locations/templates/locations.html
+++ b/modules-available/locations/templates/locations.html
@@ -9,10 +9,10 @@
 			<th>
 				{{#havestatistics}}{{lang_machineCount}}{{/havestatistics}}
 			</th>
-			<th class="slx-nowrap">
+			<th class="text-nowrap">
 				{{#havebaseconfig}}{{lang_editConfigVariables}}{{/havebaseconfig}}
 			</th>
-			<th class="slx-nowrap">
+			<th class="text-nowrap">
 				{{#havesysconfig}}{{lang_sysConfig}}{{/havesysconfig}}
 			</th>
 		</tr>
@@ -22,13 +22,13 @@
 					<div style="display:inline-block;width:{{depth}}em"></div>
 					<a href="#" onclick="slxOpenLocation(this, {{locationid}})">{{locationname}} <b class="caret"></b></a>
 				</td>
-				<td class="slx-nowrap" align="right">
+				<td class="text-nowrap" align="right">
 					{{#havestatistics}}
 					{{clientCount}}
 					<a class="btn btn-default btn-xs" href="?do=Statistics&amp;show=list&amp;filters=location={{locationid}}"><span class="glyphicon glyphicon-eye-open"></span></a>
 					{{/havestatistics}}
 				</td>
-				<td class="slx-nowrap">
+				<td class="text-nowrap">
 					{{#havebaseconfig}}
 					<div class="pull-right" style="z-index:-1">
 						<a class="btn btn-default btn-xs" href="?do=baseconfig&amp;module=locations&amp;locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span></a>
@@ -38,7 +38,7 @@
 					{{/overriddenVars}}
 					{{/havebaseconfig}}
 				</td>
-				<td class="slx-nowrap">
+				<td class="text-nowrap">
 					{{#havesysconfig}}
 					<div class="pull-right">
 						<a class="btn btn-default btn-xs" href="?do=sysconfig&amp;locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span></a>
@@ -53,7 +53,7 @@
 		{{#unassignedCount}}
 		<tr>
 			<td>{{lang_unassignedMachines}}</td>
-			<td class="slx-nowrap" align="right">
+			<td class="text-nowrap" align="right">
 				{{unassignedCount}}
 				<a class="btn btn-default btn-xs" href="?do=Statistics&amp;show=list&amp;filters=location=0">
 					<span class="glyphicon glyphicon-eye-open"></span>
diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html
index 3a1b52ac..ca4b971a 100644
--- a/modules-available/statistics/templates/clientlist.html
+++ b/modules-available/statistics/templates/clientlist.html
@@ -58,7 +58,7 @@
 	</tr>
 	{{#rows}}
 	<tr>
-		<td class="slx-nowrap">
+		<td class="text-nowrap">
 			{{#hasnotes}}<span class="glyphicon glyphicon-exclamation-sign pull-right"></span>{{/hasnotes}}
 			{{#state_off}}
 			<span class="glyphicon glyphicon-off" title="{{lang_machineOff}}"></span>
diff --git a/modules-available/statistics/templates/kvmstate.html b/modules-available/statistics/templates/kvmstate.html
index c44fb9ab..33a00d38 100644
--- a/modules-available/statistics/templates/kvmstate.html
+++ b/modules-available/statistics/templates/kvmstate.html
@@ -13,7 +13,7 @@
 						</tr>
 						{{#rows}}
 						<tr id="kvm{{kvmstate}}">
-							<td class="text-left slx-nowrap">
+							<td class="text-left text-nowrap">
 								<a class="filter-val" data-filter-val="{{kvmstate}}" href="?do=Statistics&amp;show=stat&amp;filters={{query}}~,~kvmstate={{kvmstate}}">{{kvmstate}}</a>
 							</td>
 							<td class="text-right">{{count}}</td>
diff --git a/modules-available/statistics/templates/memory.html b/modules-available/statistics/templates/memory.html
index 2d50c47f..ae040674 100644
--- a/modules-available/statistics/templates/memory.html
+++ b/modules-available/statistics/templates/memory.html
@@ -13,7 +13,7 @@
 						</tr>
 						{{#rows}}
 						<tr id="ramid{{gb}}" class="{{class}}">
-							<td class="text-left slx-nowrap">
+							<td class="text-left text-nowrap">
 								<a class="filter-val" data-filter-val="{{gb}}" href="?do=Statistics&amp;show=stat&amp;filters={{query}}~,~gbram={{gb}}">{{gb}}&thinsp;GiB</a>
 							</td>
 							<td class="text-right">{{count}}</td>
diff --git a/modules-available/statistics/templates/newclients.html b/modules-available/statistics/templates/newclients.html
index 0d9c74df..e7d79818 100644
--- a/modules-available/statistics/templates/newclients.html
+++ b/modules-available/statistics/templates/newclients.html
@@ -14,7 +14,7 @@
 				</tr>
 				{{#rows}}
 				<tr style="{{style}}">
-					<td class="slx-nowrap"><a href="?do=Statistics&amp;uuid={{machineuuid}}">{{hostname}}</a></td>
+					<td class="text-nowrap"><a href="?do=Statistics&amp;uuid={{machineuuid}}">{{hostname}}</a></td>
 					<td class="text-right">{{firstseen}}</td>
 					<td class="{{kvmclass}}">{{kvmicon}}</td>
 					<td class="text-right {{ramclass}}">{{gbram}}&thinsp;GiB</td>
diff --git a/modules-available/sysconfig/templates/custom-filelist.html b/modules-available/sysconfig/templates/custom-filelist.html
index 3ad241dd..344eece3 100644
--- a/modules-available/sysconfig/templates/custom-filelist.html
+++ b/modules-available/sysconfig/templates/custom-filelist.html
@@ -4,7 +4,7 @@
 {{#files}}
 	<tr>
 		{{#isdir}}
-			<td class="fileEntry isdir" colspan="2">{{name}}</td>
+			<td class="fileEntry slx-bold" colspan="2">{{name}}</td>
 		{{/isdir}}
 		{{^isdir}}
 			<td class="fileEntry">{{name}}</td>
diff --git a/modules-available/sysconfig/templates/custom-fileselect.html b/modules-available/sysconfig/templates/custom-fileselect.html
index 000c8d10..f14a6fde 100644
--- a/modules-available/sysconfig/templates/custom-fileselect.html
+++ b/modules-available/sysconfig/templates/custom-fileselect.html
@@ -16,7 +16,7 @@
 	{{#files}}
 		<tr>
 			{{#isdir}}
-				<td class="fileEntry isdir" colspan="2">{{name}}</td>
+				<td class="fileEntry slx-bold" colspan="2">{{name}}</td>
 			{{/isdir}}
 			{{^isdir}}
 				<td class="fileEntry">{{name}}</td>
diff --git a/modules-available/sysconfig/templates/list-configs.html b/modules-available/sysconfig/templates/list-configs.html
index ed027385..987becfd 100644
--- a/modules-available/sysconfig/templates/list-configs.html
+++ b/modules-available/sysconfig/templates/list-configs.html
@@ -21,7 +21,7 @@
 				<table id="conftable" class="slx-table" style="max-width:100px !important">
 					{{#configs}}
 					<tr>
-						<td data-modlist="{{modlist}}" class="slx-pointer slx-width-ignore slx-nowrap"onclick="showmod(this, 'bold')" onmouseover="showmod(this, 'fade')" onmouseout="showmod(this, 'reset')" width="100%">
+						<td data-modlist="{{modlist}}" class="slx-pointer slx-width-ignore text-nowrap"onclick="showmod(this, 'bold')" onmouseover="showmod(this, 'fade')" onmouseout="showmod(this, 'reset')" width="100%">
 							<div class="slx-dyn-ellipsis">{{config}}</div>
 						</td>
 						<td>
@@ -45,7 +45,7 @@
 							</span>
 							{{/locationCount}}
 						</td>
-						<td class="slx-nowrap">
+						<td class="text-nowrap">
 							<button
 									{{#needrebuild}}
 									class="refconf btn btn-primary btn-xs"
@@ -55,7 +55,7 @@
 							{{/needrebuild}}
 							name="rebuild" value="{{configid}}" title="{{lang_rebuild}}"><span class="glyphicon glyphicon-refresh"></span></button>
 						</td>
-						<td class="slx-nowrap">
+						<td class="text-nowrap">
 							<a class="btn btn-success btn-xs" href="?do=SysConfig&amp;action=addconfig&amp;edit={{configid}}" title="{{lang_edit}}"><span class="glyphicon glyphicon-edit"></span></a>
 							<button class="btn btn-danger btn-xs" name="del" value="{{configid}}" title="{{lang_delete}}"><span class="glyphicon glyphicon-trash"></span></button>
 						</td>
diff --git a/modules-available/sysconfig/templates/list-modules.html b/modules-available/sysconfig/templates/list-modules.html
index 5b2c940b..29726c5d 100644
--- a/modules-available/sysconfig/templates/list-modules.html
+++ b/modules-available/sysconfig/templates/list-modules.html
@@ -11,15 +11,15 @@
 				<table id="modtable" class="slx-table" style="max-width:100px !important">
 					{{#modules}}
 					<tr>
-						<td class="badge slx-nowrap">{{moduleType}}</td>
-						<td data-id="{{id}}" class="modrow slx-width-ignore slx-nowrap" width="100%"><div class="slx-dyn-ellipsis">{{title}}</div></td>
-						<td class="slx-nowrap">
+						<td class="badge text-nowrap">{{moduleType}}</td>
+						<td data-id="{{id}}" class="modrow slx-width-ignore text-nowrap" width="100%"><div class="slx-dyn-ellipsis">{{title}}</div></td>
+						<td class="text-nowrap">
 							{{#allowDownload}}
 							<button class="btn btn-default btn-xs" name="list" value="{{id}}" title="{{lang_show}}"><span class="glyphicon glyphicon-eye-open"></span></button>
 							<button class="btn btn-default btn-xs" name="download" value="{{id}}" title="{{lang_download}}"><span class="glyphicon glyphicon-download-alt"></span></button>
 							{{/allowDownload}}
 						</td>
-						<td class="slx-nowrap">
+						<td class="text-nowrap">
 							<button
 									{{#needRebuild}}
 									class="refmod btn btn-primary btn-xs"
diff --git a/style/default.css b/style/default.css
index d38ca9e0..b62ab64b 100644
--- a/style/default.css
+++ b/style/default.css
@@ -84,10 +84,6 @@ body {
   height: 34px;
 }
 
-.isdir {
-	font-weight: bold;
-}
-
 .slx-litehead {
 	margin: 0px 10px 5px 10px;
 	color: #aaa;
@@ -137,10 +133,6 @@ body {
 	background-color: #eee;
 }
 
-.slx-bold {
-	font-weight: bold;
-}
-
 .slx-ellipsis {
 	text-overflow: ellipsis;
 	white-space: nowrap;
@@ -155,10 +147,6 @@ body {
 	display: block;
 }
 
-.slx-nowrap {
-	white-space: nowrap;
-}
-
 .slx-space {
 	margin-top: 1em;
 	margin-bottom: 1em;
-- 
cgit v1.2.3-55-g7522