rbrindley: branch rbrindley/welcome_revamp r4183 - in /team/rbrindley/welcome...

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Fri Nov 21 00:04:31 2008
New Revision: 4183

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4183
Log:

- added a legend
- misc container syling changes
- separated 'sortable' calls due to containment issues


Modified:
    team/rbrindley/welcome_revamp/config/js/welcome2.js
    team/rbrindley/welcome_revamp/config/welcome2.html

Modified: team/rbrindley/welcome_revamp/config/js/welcome2.js
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/welcome_revamp/config/js/welcome2.js?view=diff&rev=4183&r1=4182&r2=4183
==============================================================================
--- team/rbrindley/welcome_revamp/config/js/welcome2.js (original)
+++ team/rbrindley/welcome_revamp/config/js/welcome2.js Fri Nov 21 00:04:31 2008
@@ -22,12 +22,22 @@
  /* This function will be called when the page has completed loading */
  $(document).ready(function() {
 
- 	$('#sysstat_left_container, #sysstat_right_container').sortable({
+ 	$('#sysstat_right_container').sortable({
 		axis: 'y',
 		containment: 'div.content_container',
 		cursor: 'move',
 		handle: 'div.handle',
-		items: '> div',
+		items: '> div:not(#legend)',
+		opacity: 0.7,
+		placeholder: 'placeholder'
+	});
+
+ 	$('#sysstat_left_container').sortable({
+		axis: 'y',
+		containment: 'div.content_container',
+		cursor: 'move',
+		handle: 'div.handle',
+		items: '> div:not(#legend)',
 		opacity: 0.7,
 		placeholder: 'placeholder'
 	});

Modified: team/rbrindley/welcome_revamp/config/welcome2.html
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/welcome_revamp/config/welcome2.html?view=diff&rev=4183&r1=4182&r2=4183
==============================================================================
--- team/rbrindley/welcome_revamp/config/welcome2.html (original)
+++ team/rbrindley/welcome_revamp/config/welcome2.html Fri Nov 21 00:04:31 2008
@@ -47,7 +47,7 @@
 	-webkit-border-radius: 8px;
 	margin: 8px;
 	padding: 1px;
-	padding-top: 16px;
+	padding-top: 5px;
 }
 
 #sysstat_left_container {
@@ -58,16 +58,12 @@
 	margin-left: 4px;
 }
 
-div.content_container div.content {
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	border: 1px solid #6b79a5;
-	margin: 4px;
+#sysstat_hdr_container {
+	margin-top: 8px;
 }
 
 div.content_container div div.handle {
 	cursor: move;
-	background-color: #6b79a5;
 	padding-left: 10px;
 	-moz-border-radius-topleft: 4px;
 	-moz-border-radius-topright: 4px;
@@ -75,18 +71,31 @@
 	-webkit-border-radius-topright: 4px;
 }
 
+#sysstat_hdr_container #legend {
+	display: block;
+	float: right;
+	text-align: left;
+}
+
+div.content_container div.content {
+	clear: both;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	margin: 4px;
+}
+
 div.content_container div.content div.body {
 	padding: 4px;
-	-moz-border-radius-botleft: 4px;
-	-moz-border-radius-botright: 4px;
-	-webkit-border-radius-botleft: 4px;
-	-webkit-border-radius-botright: 4px;
+	border: 1px solid #6b79a5;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	-webkit-border-radius: 4px;
 }
 
 div.content_container .title {
-	color: #FFFFFF;
 	font-weight: bold;
 	font-size: 14px;
+	color: #6b79a5;
 }
 
 div.placeholder {
@@ -96,6 +105,10 @@
 	border: 1px dotted #6b79a5;
 	margin: 4px;
 	height: 50px;
+}
+
+div.clear {
+	clear: both;
 }
 
 </style>
@@ -116,13 +129,19 @@
 		<span class='refresh_icon' onclick="window.location.reload();" >&nbsp;<img src="images/refresh.png" title=" Refresh " border=0 >&nbsp;</span>
 	</div>
 
-	<div id="sysstat_hdr_container">
-		<div id="header_title">System Status</div>
-		<div id="ast_uptime"></div>
-		<div id="sys_uptime"></div>
-	</div>
-
 	<div class="left column">
+		<div id="sysstat_hdr_container">
+			<div id="legend">
+				<img src="images/status_green.png" border="0"> Free <br />
+				<img src="images/status_red.png" border="0"> Busy <br />
+				<img src="images/status_gray.png" border="0"> UnAvailable <br />
+				<img src="images/status_orange.png" border="0"> Ringing <br />
+			</div>
+			<div class="clear"></div>
+			<div id="header_title">System Status</div>
+			<div id="ast_uptime"></div>
+			<div id="sys_uptime"></div>
+		</div>
 		<div id="sysstat_left_container" class="content_container">
 			<div id="sys_status_users" class="content">
 				<div class="handle title">Trunks</div>