From bd71a756a9f3c7ad0b286203bb117812c9cbb7d4 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Sat, 12 Oct 2013 13:49:02 +0800
Subject: [PATCH] [enable module] improved ui, fixed bug for wiki

---
 media/css/seahub.css                                |  7 +++++++
 .../group/templates/group/modules_toggle_form.html  | 13 +++++++------
 seahub/group/templates/group/tabnav.html            |  2 +-
 seahub/templates/snippets/modules_toggle_form.html  | 13 +++++++------
 seahub/templates/snippets/modules_toggle_tab.html   |  2 +-
 seahub/views/wiki.py                                |  5 +++++
 6 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index c2a67be099..099fe1b197 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -2615,3 +2615,10 @@ textarea:-moz-placeholder {/* for FF */
 #search-repo-form input[type=text] {
     margin: 4px 4px;
 }
+#enable-mods {
+    color:#888;
+}
+#enable-mods:hover {
+    color:#666;
+    text-decoration:none;
+}
diff --git a/seahub/group/templates/group/modules_toggle_form.html b/seahub/group/templates/group/modules_toggle_form.html
index 28522a785f..303ff4b139 100644
--- a/seahub/group/templates/group/modules_toggle_form.html
+++ b/seahub/group/templates/group/modules_toggle_form.html
@@ -1,14 +1,15 @@
 {% load i18n %}
 <form id="mods-enable-form" method="post" action="{% url 'group_toggle_modules' group.id %}" class="hide">{% csrf_token%}
-    <h3>{% trans "Available Modules"%}</h3>
-    <div>
+    <h3>{% trans "Enable Modules"%}</h3>
+    <ul>
     {% for mod in mods_available %}
       {% if mod == 'group wiki' %}
-      <span><input type="checkbox" name="group_wiki" {%if mod in mods_enabled%}checked {% endif%}/></span>
-      <span>{% trans "Wiki" %}</span>
+      <li>
+      <input class="vam" type="checkbox" name="group_wiki" {%if mod in mods_enabled%}checked {% endif%}/></span>
+      <span class="vam">{% trans "Wiki" %}</span>
+      </li>
       {% endif %}
     {% endfor %}    
-    </div>
-
+    </ul>
     <input type="submit" id="mods-enable-submit" value="{% trans "Submit"%}" class="submit"/>
 </form>
diff --git a/seahub/group/templates/group/tabnav.html b/seahub/group/templates/group/tabnav.html
index 9c37e3d9c0..65834508a2 100644
--- a/seahub/group/templates/group/tabnav.html
+++ b/seahub/group/templates/group/tabnav.html
@@ -24,7 +24,7 @@
         {% if is_staff %}
         <li class="tabnav-tab {% if cur == 'admin'%}tabnav-tab-cur{%endif%}"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
 
-        <li class="tabnav-tab"><a id="enable-mods" href="#"><img src="{{MEDIA_URL}}img/calcplus-16.png" title="{% trans "Available Modules" %}" alt="{% trans "Available Modules"%}" /></a></li>
+        <li class="tabnav-tab"><a id="enable-mods" href="#" title="{% trans "Enable Modules" %}"><span class="icon-ellipsis-horizontal"></span></a></li>
         {% endif %}
 
     </ul>
diff --git a/seahub/templates/snippets/modules_toggle_form.html b/seahub/templates/snippets/modules_toggle_form.html
index 47b4328bb0..be8879f59e 100644
--- a/seahub/templates/snippets/modules_toggle_form.html
+++ b/seahub/templates/snippets/modules_toggle_form.html
@@ -1,14 +1,15 @@
 {% load i18n %}
 <form id="mods-enable-form" method="post" action="{% url 'toggle_modules' %}" class="hide">{% csrf_token%}
-    <h3>{% trans "Available Modules"%}</h3>
-    <div>
+    <h3>{% trans "Enable Modules"%}</h3>
+    <ul>
     {% for mod in mods_available %}
       {% if mod == 'personal wiki' %}
-      <span><input type="checkbox" name="personal_wiki" {%if mod in mods_enabled%}checked {% endif%}/></span>
-      <span>{% trans "Personal Wiki" %}</span>
+      <li>
+      <input class="vam" type="checkbox" name="personal_wiki" {%if mod in mods_enabled%}checked {% endif%}/>
+      <span class="vam">{% trans "Personal Wiki" %}</span>
+      </li>
       {% endif %}
     {% endfor %}    
-    </div>
-
+    </ul>
     <input type="submit" id="mods-enable-submit" value="{% trans "Submit"%}" class="submit"/>
 </form>
diff --git a/seahub/templates/snippets/modules_toggle_tab.html b/seahub/templates/snippets/modules_toggle_tab.html
index 367d154f6a..09fd4435f9 100644
--- a/seahub/templates/snippets/modules_toggle_tab.html
+++ b/seahub/templates/snippets/modules_toggle_tab.html
@@ -1,2 +1,2 @@
 {% load i18n %}
-<li class="tabnav-tab"><a id="enable-mods" href="#"><img src="{{MEDIA_URL}}img/calcplus-16.png" title="{% trans "Available Modules" %}" alt="{% trans "Available Modules"%}" /></a></li>
+<li class="tabnav-tab"><a id="enable-mods" href="#" title="{% trans "Enable Modules" %}"><span class="icon-ellipsis-horizontal"></span></a></li>
diff --git a/seahub/views/wiki.py b/seahub/views/wiki.py
index a5ea7346bf..990dd19ca3 100644
--- a/seahub/views/wiki.py
+++ b/seahub/views/wiki.py
@@ -46,8 +46,13 @@ def personal_wiki(request, page_name="home"):
         content, repo, dirent = get_personal_wiki_page(username, page_name)
     except WikiDoesNotExist:
         wiki_exists = False
+        # get available modules(wiki, etc)
+        mods_available = get_available_mods_by_user(username)
+        mods_enabled = get_enabled_mods_by_user(username)
         return render_to_response("wiki/personal_wiki.html", {
                 "wiki_exists": wiki_exists,
+                "mods_enabled": mods_enabled,
+                "mods_available": mods_available,
                 }, context_instance=RequestContext(request))
     except WikiPageMissing:
         repo = get_personal_wiki_repo(username)