Changeset 1845

Timestamp:

08/15/08 16:21:01 (3 months ago)

Author:

taher

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/admin/PageVServer.py (modified) (7 diffs)
• cherokee/trunk/admin/PageVServers.py (modified) (4 diffs)
• cherokee/trunk/admin/static/css/cherokee.css (modified) (7 diffs)

cherokee/trunk/ChangeLog

@@ +1 @@
+2008-08-14  Taher Shihadeh <taher@unixwars.com>
+
+        * admin/PageVServers.py, admin/PageVServer.py,
+        admin/static/css/cherokee.css: addresses UI enhancement proposal
+        at http://code.google.com/p/cherokee/issues/detail?id=86.
+
-2008-08-15  Alvaro Lopez Ortega  <alvaro@alobbs.com>
-
-        * admin/PageVServer.py (PageVServer._render_vserver_guts): Fixes
-        an unfortunate error. The administration interface fails to set
-nd
+
-        variable value messed up the property key.
-

cherokee/trunk/admin/PageVServer.py

@@ -51 +51 @@
-        self._priorities_userdir = None
-        self._rule_table         = 1
-
+
-    def _op_handler (self, uri, post):
-        assert (len(uri) > 1)
@@ -273 +273 @@
-        txt += '<table id="%s" class="rulestable">' % (table_name)
-        txt += '<tr NoDrag="1" NoDrop="1"><th>Target</th><th>Type</th><th>Handler</th><th>Auth</th><th>Final</th></tr>'
-
+
-        # Rule list
-        for prio in priorities:
@@ -280 +280 @@
-            _type = conf.get_val('match')
-            pre   = '%s!%s' % (cfg_key, prio)
-
-            
+
+
-            rule_module = module_obj_factory (_type, self._cfg, pre, self.submit_url)
-            name        = rule_module.get_name()
-            name_type   = rule_module.get_type_name()
-
+
-            if _type != 'default':
-                link     = '<a href="%s/prio/%s">%s</a>' % (url_prefix, prio, name)
@@ -312 +312 @@
-
-        txt += '</table>\n'
-
+
+
-                      $(document).ready(function() {
-                        $("#%(name)s tr:even').addClass('alt')");
@@ -324 +325 @@
-                                post += 'update_prio=' + rows[i].id + ',' + prio + '&';
-                              }
-
+
-                                  function (data, textStatus) {
-  
+
-                                  }
-                              );
@@ -332 +333 @@
-                        });
-                      });
+
+                      $(document).ready(function(){
+                        $("table.rulestable tr:odd").addClass("odd");
+                      });
+
+                      $(document).mouseup(function(){
+                        $("table.rulestable tr:even").removeClass("odd");
+                        $("table.rulestable tr:odd").addClass("odd");
+                      });
-                      </script>
- 
+
-                      'url' :   self.submit_ajax_url,
-                      'prefix': cfg_key}
@@ -374 +384 @@
-                                  modules_available(LOGGERS), NOTE_LOGGERS)
-        txt += self.Indent(str(table))
-
+
-        # Writers
-
+
-        if format:
-            writers = ''

cherokee/trunk/admin/PageVServers.py

@@ -129 +129 @@
-            else:
-                logging = 'no'
-
+
-            if nick != "default":
-                js = "post_del_key('/ajax/update', 'vserver!%s');"%(prio)
@@ -140 +140 @@
-
-        txt += '</table>'
-
+
+
-                      $(document).ready(function() {
-                        $("#%(name)s tr:even').addClass('alt')");
@@ -151 +152 @@
-                                post += rows[i].id + ',';
-                              }
-
+
-                                  function (data, textStatus) {
-  
+
-                                  }
-                              );
@@ -159 +160 @@
-                        });
-                      });
+
+                      $(document).ready(function(){
+                        $("table.rulestable tr:odd").addClass("odd");
+                      });
+
+                      $(document).mouseup(function(){
+                        $("table.rulestable tr:even").removeClass("odd");
+                        $("table.rulestable tr:odd").addClass("odd");
+                      });
-                      </script>
- 
+
-                      'url' :   '/vserver/ajax_update'}
-

cherokee/trunk/admin/static/css/cherokee.css

@@ -7 +7 @@
-
-.clearfix:after {
- 
- 
- 
- 
+
+
+
+
-    visibility: hidden;
-}
@@ -126 +126 @@
-/** HELP **/
-#help-area {
-
+
-}
-
@@ -191 +191 @@
-}
-
- 
+
-.dialog-warning h2,
- 
+
-{
-    margin: 0 0 0.3em 0;
@@ -220 +220 @@
-.tab dt:hover {
-    background:#efefef url(../images/collapsed.gif) no-repeat scroll 0px 4px;
-      
-
+
+
-.tab dt.selected:hover {
-
-
-
-
+
+
+
-a.button {
-    background: transparent url('../images/button-right.png') no-repeat scroll top right;
@@ -250 +249 @@
-    background-position: bottom right;
-    color: #122c4d;
- 
+
-}
-
-a.button:active span {
-    background-position: bottom left;
- 
+
-}
-
@@ -299 +298 @@
-
-.tableprop .title {
-  
+
-}
-
@@ -319 +318 @@
-  font-weight: bold;
-}
+
+/* Alternate row color in rule list */
+table.rulestable tr.odd td {
+  background-color:#F4F7FB;
+}