modified 'add' icon, grp public icon & 'quit', sysadmin user/lib search

media/css/seahub.css

@@ -359,10 +359,6 @@ textarea:-moz-placeholder {/* for FF */
 	border-radius:1000px;
     margin:0 6px 0 4px;
 }
-.side-tabnav .hd .icon-globe { /*for 'group'*/
-    line-height:1;
-    color:#666;
-}
 .side-tabnav-tabs {
     margin-bottom:1em;
 }
@@ -501,10 +497,21 @@ textarea:-moz-placeholder {/* for FF */
     color:#de3f1c;
 	text-decoration:none;
 }
-
 .side-info dt {
     margin-top:15px;
 }
+.side-search-form {
+    margin-top:25px;
+}
+.side-search-form .input {
+    width:188px;
+    padding:2px 5px;
+    background:#fafafa;
+    box-shadow: inset 0 1px 2px rgba(0,0,0,0.075);
+}
+.side-search-form .input:focus {
+    background:#fff;
+}
 /**** checkbox ****/
 .checkbox-orig {
     width:14px;
@@ -980,6 +987,7 @@ textarea:-moz-placeholder {/* for FF */
 .repo-file-list-topbar button {
     height:29px;
     background:#fff;
+    line-height:17px;
 }
 /* info-bar */
 #info-bar,
@@ -2726,12 +2734,6 @@ textarea:-moz-placeholder {/* for FF */
     font-size:1em;
     margin:0 3px 0 0;
 }
-#quit-group {
-    margin-top:4px;
-    font-size:12px;
-    font-weight:normal;
-    color:#888;
-}
 .help-con {
 	padding:0 0 0 30px;
 }

seahub/contacts/templates/contacts/contact_list.html

@@ -8,7 +8,7 @@
 {% block right_panel %}
 <div class="ovhd hd">
     <h3 class="fleft">{% trans "Contacts"%}</h3>
-    <button id="contact-add" class="fright"><span class="add icon-plus-sign-alt"></span>{% trans "Add Contacts"%}</button>
+    <button id="contact-add" class="fright"><img src="{{ MEDIA_URL }}img/add.png" alt="" class="add vam" /><span class="vam">{% trans "Add Contacts"%}</span></button>
 </div>
 {% if contacts %}
 <table>

seahub/group/templates/group/group_base.html

@@ -10,14 +10,11 @@
     <div class="hd w100 ovhd">
         <h3 class="fleft">
         {% grp_avatar group.props.id 32 %} <span title="{{ group.group_name }}" class="vam">{{ group.group_name|truncatechars:11 }}</span>
-        {% if group.is_pub %}<span class="icon-globe" title="{% trans "This group is public." %}"></span>{% endif %}
+        {% if group.is_pub %}<img src="{{MEDIA_URL}}img/grp_public.png" alt="" title="{% trans "This group is public." %}" class="vam" />{% endif %}
         </h3>
         {% if is_staff %}
         <img id="enable-mods" class="fright" title="{% trans "Enable Modules" %}" src="{{MEDIA_URL}}img/setting.png" alt="" style="margin-top:8px;" />
         {% endif %}
-        {% if group.view_perm != 'pub' and not is_staff %}
-        <a id="quit-group" href="#" data-url="{% url 'group_quit' group.id %}" class="fright">{% trans "Quit" %}</a>
-        {% endif %}
     </div>
     <ul class="side-tabnav-tabs">
         <li class="tab {% block cur_library %}{% endblock%}"><a href="{% url 'group_info' group.id %}" class="lib">{% trans "Libraries" %}</a></li>
@@ -69,9 +66,5 @@ $('#enable-mods').click(function() {
     $('#simplemodal-container').css('height', 'auto');
     return false;
 });
-addConfirmTo($('#quit-group'), {
-        'title':'{% trans "Quit Group" %}',
-        'con':'{% trans "Are you sure you want to quit this group?" %}'
-});
 </script>
 {% endblock %}

seahub/group/templates/group/group_info.html

@@ -11,7 +11,7 @@
             <li class="tab"><a href="#grp-repos" class="a">{% trans "Libraries" %}</a></li>
             <li class="tab long-tab"><a href="#grp-repos-commits" class="a">{% trans "Recent Changes" %}</a></li>
         </ul>
-        <button id="repo-create" class="fright"><span class="add icon-plus-sign-alt"></span>{% trans "New Library" %}</button>
+        <button id="repo-create" class="fright"><img src="{{ MEDIA_URL }}img/add.png" alt="" class="add vam" /><span class="vam">{% trans "New Library" %}</span></button>
     </div>
     <div id="grp-repos" class="hide">
     {% if repos %}

seahub/group/templates/group/group_manage.html

@@ -12,7 +12,7 @@
     </ul>
     <div id="members">
         <div class="ovhd">
-            <button id="group-member-add" class="fright"><span class="add icon-plus-sign-alt"></span>{% trans "Add Members"%}</button>
+            <button id="group-member-add" class="fright"><img src="{{ MEDIA_URL }}img/add.png" alt="" class="add vam" /><span class="vam">{% trans "Add Members"%}</span></button>
         </div>
         {% if members %}
         <table>
@@ -39,7 +39,7 @@
 
     <div class="hide" id="administrators">
         <div class="ovhd">
-            <button id="group-admin-add" class="fright"><span class="add icon-plus-sign-alt"></span>{% trans "Add Admins"%}</button>
+            <button id="group-admin-add" class="fright"><img src="{{ MEDIA_URL }}img/add.png" alt="" class="add vam" /><span class="vam">{% trans "Add Admins"%}</span></button>
         </div>
         {% if admins %}
         <table>

seahub/group/templates/group/group_members.html

@@ -4,7 +4,12 @@
 {% block cur_members %}tab-cur{%endblock%}
 
 {% block right_panel %}
-<h3 class="hd">{% trans "Members" %}</h3>
+<div class="hd">
+<h3 class="fleft">{% trans "Members" %}</h3>
+{% if group.view_perm != 'pub' and not is_staff %}
+<button id="quit-group" data-url="{% url 'group_quit' group.id %}" class="fright">{% trans "Quit" %}</button>
+{% endif %}
+</div>
 <ul class="user-list">
     {% for m in members %}
     {% with e=m.user_name id=m.user_name|id_or_email %}
@@ -25,5 +30,12 @@
 {% endblock %}
 
 {% block extra_script %}{{block.super}}
+<script type="text/javascript">
+addConfirmTo($('#quit-group'), {
+    'title':'{% trans "Quit Group" %}',
+    'con':'{% trans "Are you sure you want to quit this group?" %}'
+});
+</script>
+
 {% include 'snippets/add_to_contacts_js.html' %}
 {% endblock %}

seahub/group/templates/group/groups_right_panel.html

@@ -2,7 +2,7 @@
 {% load url from future %}
 
 <h3>{% trans "My Groups" %}</h3>
-<button id="group-add"><span class="add icon-plus-sign-alt"></span>{% trans "New Group" %}</button>
+<button id="group-add"><img src="{{ MEDIA_URL }}img/add.png" alt="" class="add vam" /><span class="vam">{% trans "New Group" %}</span></button>
 {% if joined_groups %}
 <ul class="group-list w100 ovhd">
     {% for group in joined_groups %}

seahub/templates/pubrepo.html

@@ -7,7 +7,7 @@
 {% block right_panel %}
 <div class="hd ovhd">
     <h3 class="fleft">{% trans "Libraries" %}</h3>
-    <button id="repo-create" class="fright"><span class="add icon-plus-sign-alt"></span>{% trans "New Library"%}</button>
+    <button id="repo-create" class="fright"><img src="{{ MEDIA_URL }}img/add.png" alt="" class="add vam" /><span class="vam">{% trans "New Library"%}</span></button>
 </div>
 {% if public_repos %}
 <table>

seahub/templates/pubuser.html

@@ -2,30 +2,11 @@
 {% load seahub_tags avatar_tags i18n %}
 {% load url from future %}
 
-{% block extra_style %}
-{% if has_file_search %}
-<style type="text/css">
-#search-org-user-form {
-    margin-top:25px;
-}
-#search-org-user-form .input {
-    width:188px;
-    padding:2px 5px;
-    background:#fafafa;
-    box-shadow: inset 0 1px 2px rgba(0,0,0,0.075);
-}
-#search-org-user-form .input:focus {
-    background:#fff;
-}
-</style>
-{% endif %}
-{% endblock %}
-
 {% block cur_user %}tab-cur{% endblock %}
 
 {% block left_panel %}{{block.super}}
 {% if has_file_search %}
-<form action="{% url "pubuser_search" %}" method="get" id="search-org-user-form">
+<form action="{% url "pubuser_search" %}" method="get" class="side-search-form">
     <input type="text" name="search" value="{{search}}" placeholder="{% trans "Find users..." %}" class="input" />
 </form>
 {% endif %}

seahub/templates/snippets/my_owned_repos.html

@@ -10,7 +10,7 @@
         <li class="tab"><a href="#repos-shared-to-me" class="a">{% trans "Shared" %}</a></li>
         <li class="tab"><a href="#group-repos" class="a">{% trans "Group" %}</a></li>
     </ul>
-    <button id="repo-create" class="fright"><span class="add icon-plus-sign-alt"></span>{% trans "New Library" %}</button>
+    <button id="repo-create" class="fright"><img src="{{ MEDIA_URL }}img/add.png" alt="" class="add vam" /><span class="vam">{% trans "New Library" %}</span></button>
 </div>
 <div id="my-own-repos" class="hide">
 {% if owned_repos %}

seahub/templates/sysadmin/sys_ldap_useradmin.html

@@ -3,13 +3,18 @@
 
 {% block cur_users %}tab-cur{% endblock %}
 
+{% block left_panel %}{{block.super}}
+<form action="{% url 'user_search' %}" method="get" class="side-search-form">
+    <input type="text" name="email" class="input" value="" placeholder="{% trans "Search users..." %}" />
+</form>
+{% endblock %}
+
 {% block right_panel %}
 <div class="tabnav">
     <ul class="tabnav-tabs">
         <li class="tabnav-tab"><a href="{% url 'sys_useradmin' %}">{% trans "Database" %}</a></li>
         <li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_ldap_useradmin' %}">{% trans "LDAP" %}</a></li>
     </ul>
-    <button class="icon-search fright" id="search-user-btn"> {% trans "Search" %}</button>    
 </div>
 
 <table>
@@ -40,9 +45,6 @@
 
 {% block extra_script %}
 <script type="text/javascript">
-$('#search-user-btn').click(function() {
-    location.href = "{% url 'user_search' %}";
-});
 
 </script>
 {% endblock %}

seahub/templates/sysadmin/sys_list_orphan.html

@@ -2,6 +2,12 @@
 {% load i18n %}
 {% block cur_repo %}tab-cur{% endblock %}
 
+{% block left_panel %}{{block.super}}
+<form action="{% url 'sys_repo_search' %}" method="get" class="side-search-form">
+    <input type="text" name="name" class="input" value="" placeholder="{% trans "Search libraries by name..." %}" />
+</form>
+{% endblock %}
+
 {% block right_panel %}
 <div class="tabnav">
     <ul class="tabnav-tabs">
@@ -9,7 +15,6 @@
         <li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_list_orphan' %}">{% trans "Orphan" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'sys_list_system' %}">{% trans "System" %}</a></li>
     </ul>
-    <button class="icon-search fright" id="search-repo-btn"> {% trans "Search" %}</button>    
 </div>
 
 {% if repos %}
@@ -23,9 +28,6 @@
 
 {% block extra_script %}
 <script type="text/javascript">
-$('#search-repo-btn').click(function() {
-    location.href = "{% url 'sys_repo_search' %}";
-});
 {% include "sysadmin/repoadmin_js.html" %}
 </script>
 {% endblock %}

seahub/templates/sysadmin/sys_list_system.html

@@ -2,6 +2,12 @@
 {% load i18n %}
 {% block cur_repo %}tab-cur{% endblock %}
 
+{% block left_panel %}{{block.super}}
+<form action="{% url 'sys_repo_search' %}" method="get" class="side-search-form">
+    <input type="text" name="name" class="input" value="" placeholder="{% trans "Search libraries by name..." %}" />
+</form>
+{% endblock %}
+
 {% block right_panel %}
 <div class="tabnav">
     <ul class="tabnav-tabs">
@@ -9,7 +15,6 @@
         <li class="tabnav-tab"><a href="{% url 'sys_list_orphan' %}">{% trans "Orphan" %}</a></li>
         <li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_list_system' %}">{% trans "System" %}</a></li>
     </ul>
-    <button class="icon-search fright" id="search-repo-btn"> {% trans "Search" %}</button>    
 </div>
 
 {% if repos %}
@@ -33,12 +38,3 @@
 
 {% include "sysadmin/repo_transfer_form.html" %}
 {% endblock %}
-
-{% block extra_script %}
-<script type="text/javascript">
-$('#search-repo-btn').click(function() {
-    location.href = "{% url 'sys_repo_search' %}";
-});
-</script>
-{% endblock %}
- 

seahub/templates/sysadmin/sys_repo_admin.html

@@ -2,15 +2,19 @@
 {% load i18n %}
 {% block cur_repo %}tab-cur{% endblock %}
 
-{% block right_panel %}
+{% block left_panel %}{{block.super}}
+<form action="{% url 'sys_repo_search' %}" method="get" class="side-search-form">
+    <input type="text" name="name" class="input" value="" placeholder="{% trans "Search libraries by name..." %}" />
+</form>
+{% endblock %}
 
+{% block right_panel %}
 <div class="tabnav">
     <ul class="tabnav-tabs">
         <li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_repo_admin' %}">{% trans "All" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'sys_list_orphan' %}">{% trans "Orphan" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'sys_list_system' %}">{% trans "System" %}</a></li>
     </ul>
-    <button class="icon-search fright" id="search-repo-btn"> {% trans "Search" %}</button>    
 </div>
 
 {% if repos %}
@@ -52,9 +56,6 @@
 
 {% block extra_script %}
 <script type="text/javascript">
-$('#search-repo-btn').click(function() {
-    location.href = "{% url 'sys_repo_search' %}";
-});
 {% include "sysadmin/repoadmin_js.html" %}
 </script>
 {% endblock %}

seahub/templates/sysadmin/sys_useradmin.html

@@ -2,6 +2,12 @@
 {% load seahub_tags i18n %}
 {% block cur_users %}tab-cur{% endblock %}
 
+{% block left_panel %}{{block.super}}
+<form action="{% url 'user_search' %}" method="get" class="side-search-form">
+    <input type="text" name="email" class="input" value="" placeholder="{% trans "Search users..." %}" />
+</form>
+{% endblock %}
+
 {% block right_panel %}
 <div class="tabnav ovhd">
     <ul class="tabnav-tabs fleft">
@@ -10,13 +16,12 @@
         <li class="tabnav-tab"><a href="{% url 'sys_ldap_useradmin' %}">{% trans "LDAP" %}</a></li>
         {% endif %}
     </ul>
-    <button class="icon-search fright" id="search-user-btn"> {% trans "Search" %}</button>    
+    <button id="add-user-btn" class="fright"><img src="{{ MEDIA_URL }}img/add.png" alt="" class="add vam" /><span class="vam">{% trans "Add user" %}</span></button>
 </div>
 
-<button id="add-user-btn"><span class="add icon-plus-sign-alt"></span>{% trans "Add new user" %}</button>
 
 <form id="add-user-form" action="" method="post" class="hide">{% csrf_token %}
-    <h3>{% trans "Add new user" %}</h3>
+    <h3>{% trans "Add user" %}</h3>
     <label for="id_email">{% trans "Email" %}</label><br />
     <input type="text" name="email" id="id_email" class="input" /><br />
     <label for="id_password1">{% trans "Password" %}</label><br />
@@ -37,10 +42,6 @@
 
 {% block extra_script %}
 <script type="text/javascript">
-$('#search-user-btn').click(function() {
-    location.href = "{% url 'user_search' %}";
-});
-
 $('#add-user-form').submit(function() {
     var form = $(this),
         form_id = $(this).attr('id'),