modifed group-member-icon;rewrite confirm dialog;add confirm to rm group

group/templates/group/group_info.html

@@ -8,14 +8,14 @@
 <h3>管理员</h3>
 <ul>
 {% for member in managers %}
-<li><img src="{{MEDIA_URL}}img/default-person-20.png" alt="{{ member.short_username }}的图标" class="group-member-icon" /><span class="group-member-name">{{ member.short_username }}</span></li>
+<li><img src="{{MEDIA_URL}}img/default-person-16.png" alt="{{ member.short_username }}的图标" class="group-member-icon" /><span class="group-member-name">{{ member.short_username }}</span></li>
 {% endfor %}
 
 <h3>成员</h3>
 {% if common_members %}
 <ul>
     {% for member in common_members %}
-	<li><img src="{{MEDIA_URL}}img/default-person-20.png" alt="{{ member.short_username }}的图标" class="group-member-icon" /><span class="group-member-name">{{ member.short_username }}</span></li>
+	<li><img src="{{MEDIA_URL}}img/default-person-16.png" alt="{{ member.short_username }}的图标" class="group-member-icon" /><span class="group-member-name">{{ member.short_username }}</span></li>
     {% endfor %}
 </ul>
 {% else %}

group/templates/group/group_manage.html

@@ -5,17 +5,14 @@
 {% block left_panel %}
 <h3>操作</h3>
 <ul class="with-bg">
-    <li><a id="group-remove" href="#">解散小组</a></li>
+    <li><a id="group-remove" href="#" data="{{ SITE_ROOT }}group/rm?gid={{ group.id }}">解散小组</a></li>
     <li><a id="group-info" href="{{ SITE_ROOT }}group/{{ group.id }}/">返回小组</a></li>
 </ul>
 {% endblock %}
 
 {% block right_panel %}
-<h2>{{ group.group_name }}</h2>
+<h2>{{ group.group_name }} 小组管理</h2>
-<h3>
+<h3> 小组成员列表<button id="member-add">添加成员</button></h3>
-  小组成员列表
-  <button id="member-add">添加成员</button>
-</h3>
 {% if members %}
 <table class="member-list">
     <tr>
@@ -31,7 +28,6 @@
         {% else %}
         <td></td>
         {% endif %}
-        
     </tr>
     {% endfor %}
 </table>
@@ -58,7 +54,8 @@
 {% block extra_script %}
 <script type="text/javascript">
 $("#group-remove").click(function() {
-    location.href = "{{ SITE_ROOT }}group/rm?gid={{ group.id }}";
+	addConfirmTo($(this), '确定要解散该小组吗？');
+	return false;
 });
 
 $('.member-remove-btn').click(function() {
@@ -67,7 +64,7 @@ $('.member-remove-btn').click(function() {
 });
 
 $("#member-add").click(function() {
-    $("#member-add-form").modal({appendTo: "#main", containerCss:{padding:18}});
+    $("#member-add-form").modal({appendTo: "#main"});
     return false;
 });
                 

media/css/seahub.css

@@ -154,7 +154,7 @@ label { display: inline-block; margin:2px 0px; }
 /* popup dialog */
 #basic-modal-content {display:none;}
 #simplemodal-overlay { background-color:#000; }
-#simplemodal-container { background-color:#fff; border:3px solid #080; padding: 10px; }
+#simplemodal-container { background-color:#fff; border:3px solid #080; padding: 18px; }
 #simplemodal-container code {background:#141414; border-left:3px solid #65B43D; color:#bbb; display:block; font-size:12px; margin-bottom:12px; padding:4px 6px 6px;}
 #simplemodal-container a {color:#ddd;}
 #simplemodal-container a.modalCloseImg {background:url(../img/x.png) no-repeat; width:25px; height:29px; display:inline; z-index:3200; position:absolute; top:-15px; right:-16px; cursor:pointer;}
@@ -241,3 +241,6 @@ label { display: inline-block; margin:2px 0px; }
 .group-member-name {
 	vertical-align:middle;
 }
+#member-add {
+	margin-left:10px;
+}

media/js/utils.js

@@ -1,15 +1,18 @@
-//add delete confirm dialog
+//add op confirm dialog
-var Del_url = '';
+var Op_url = '';
-function addConfirmTo(ele) {
+function addConfirmTo(ele, confirm_con) {
     ele.each(function() {
         $(this).click(function() {
-            $('#dialog-delete-confirm').modal({appendTo:'#main'});
+			if (confirm_con) {
-            Del_url = $(this).attr('data');
+				$('#confirm-con').html(confirm_con);
+			}
+            $('#dialog-confirm').modal({appendTo:'#main'});
+            Op_url = $(this).attr('data');
         });
     });
 }
 $('#yes-btn').click(function() {
-    location.href = Del_url;
+    location.href = Op_url;
 });
 
 //handle table

templates/base.html

@@ -59,8 +59,8 @@
         <div id="main-panel" class="clear">
             {% block main_panel %}{% endblock %}
         </div>
-        <div id="dialog-delete-confirm" class="hide">
+        <div id="dialog-confirm" class="hide">
-            <p class="mgb5">确定要删除？</p>
+            <p class="mgb5" id="confirm-con">确定要删除？</p>
             <button id="yes-btn">确定</button>
             <button class="simplemodal-close">取消</button>
         </div>