Mercurial > hg > MPIWGWeb

changeset 75:df56982ecb03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
styles for hierarchical project list. some cleanup.
author casties
date Mon, 06 May 2013 20:04:00 +0200
parents e424b68244c8
children 2d3a7171f3f0
files MPIWGDepartment.py MPIWGRoot.py css/mpiwg.css
diffstat 3 files changed, 76 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/MPIWGDepartment.py	Mon May 06 16:56:19 2013 +0200
+++ b/MPIWGDepartment.py	Mon May 06 20:04:00 2013 +0200
@@ -145,19 +145,19 @@
         proj = pf.getProject(projectNumber=self.getProjectNumber())
         return proj
 
-    def getProjects(self, count=0, onlyActive=0, onlyArchived=0):
+    def getProjects(self, count=0, active=0, archived=0):
         """returns a list of projects of this department.
         
-        onlyActive = 0 : all projects
-        onlyActive = 1 : active projects
-        onlyActive = 2 : inactive projects
+        active = 0 : all projects
+        active = 1 : active projects
+        active = 2 : inactive projects
         
-        onlyArchived = 0 : all projects
-        onlyArchived = 1 : current projects
-        onlyArchived = 2 : archived projects
+        archived = 0 : all projects
+        archived = 1 : current projects
+        archived = 2 : archived projects
         """
         pf = self.getMPIWGRoot().getProjectFolder()
-        projects = pf.getProjectsAsList(self.getProjectNumber(), active=onlyActive, archived=onlyArchived)
+        projects = pf.getProjectsAsList(self.getProjectNumber(), active=active, archived=archived)
         #logging.debug("getProjects projects=%s"%repr(projects))
         if count > 0:
             return projects[:count]
--- a/MPIWGRoot.py	Mon May 06 16:56:19 2013 +0200
+++ b/MPIWGRoot.py	Mon May 06 20:04:00 2013 +0200
@@ -160,7 +160,7 @@
         if dir is None:
             return []
 
-        items = dir.objectValues(spec='MPIWGFeature')[:]
+        items = dir.objectValues(spec='MPIWGFeature')
         items.sort(key=lambda x:int(x.weight))
         if num is not None:
             # take only the last num elements
@@ -174,7 +174,7 @@
         if dir is None:
             return []
         
-        items = dir.objectValues(spec='MPIWGDepartment')[:]
+        items = dir.objectValues(spec='MPIWGDepartment')
         items.sort(key=lambda x:int(x.weight))
         return items
 
--- a/css/mpiwg.css	Mon May 06 16:56:19 2013 +0200
+++ b/css/mpiwg.css	Mon May 06 20:04:00 2013 +0200
@@ -823,6 +823,72 @@
     display: none;
 }
 
+
+/*
+ * hierarchical list (of projects)
+ */
+div.hierlist h2 {
+    text-indent: -20px;
+    padding-left: 20px;
+    padding-bottom: 5px;
+    border-bottom: 3px solid #dccbae;
+    margin-bottom: 0;
+}
+
+div.hierlist h2 img {
+    padding: 0 3px 3px 3px; 
+}
+
+div.hierlist h2 a {
+    color: inherit;
+    font-weight: inherit;
+    text-decoration: none;
+}
+
+div.hierlist ul {
+    list-style-type: none;
+    padding: 0 0 10px 0;
+    margin: 0;
+    border-bottom: 1px solid #dccbae;
+}
+
+div.hierlist li {
+    padding: 5px 0 5px 16px;
+    text-indent: -13px;
+}
+
+div.hierlist li a {
+    /* icon is more distant from text */
+    padding-left: 13px;
+}
+
+div.hierlist li.indent {
+    padding-bottom: 10px;
+    border-bottom: 1px solid #dccbae;
+    margin-bottom: 5px;
+}
+
+div.hierlist li.level_1 {
+    font-size: 14px;
+}
+
+div.hierlist li.level_2 {
+    font-weight: bold;
+    margin-left: 20px;
+}
+
+div.hierlist li.level_3 {
+    margin-left: 40px;
+}
+
+div.hierlist li.level_4 {
+    margin-left: 60px;
+}
+
+div.hierlist li.level_5 {
+    margin-left: 80px;
+}
+
 /* 
  * sidebar 
  */