Merge branch 'master' of github.com:mikemintz/deme

mikemintz · Jul 9, 2013 · 09dfe1f · 09dfe1f
2 parents 5240a49 + 674d14e
commit 09dfe1f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/deme_django/cms/templates/includes/adminbar_widgets/account.html b/deme_django/cms/templates/includes/adminbar_widgets/account.html
@@ -1,6 +1,6 @@
 {% load item_tags %}
 <li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="Account"><i class="glyphicon glyphicon-user"></i></a>
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="Account"><i class="glyphicon glyphicon-user"></i> {% viewable_name cur_agent %}</a>
   <ul class="dropdown-menu login-menu pull-right">
     {% login_menu %}
   </ul>

diff --git a/deme_django/cms/templates/templatetags/listgridbox.html b/deme_django/cms/templates/templatetags/listgridbox.html
@@ -72,7 +72,7 @@
     $(window).trigger('resize');
   });
   jqgrid_list.jqGrid('navGrid','#jqgrid_pager{{identifier}}',{edit:false,add:false,del:false});
-  jqgrid_list.jqGrid('navButtonAdd',"#jqgrid_pager{{identifier}}",{caption:"Columns",title:"Choose columns",buttonicon:"ui-icon-gear",onClickButton:function(){jqgrid_list.jqGrid('columnChooser',{});}});
+  jqgrid_list.jqGrid('navButtonAdd',"#jqgrid_pager{{identifier}}",{caption:"",title:"Choose columns",buttonicon:"ui-icon-gear",onClickButton:function(){jqgrid_list.jqGrid('columnChooser',{});}});
   {% if collection_item %}
     {% ifagentcan 'modify_membership' collection_item %}
     jqgrid_list.jqGrid('navButtonAdd',"#jqgrid_pager{{identifier}}",{caption:"Add",title:"Add an item to {% viewable_name collection_item %}",buttonicon:"ui-icon-circle-plus",onClickButton:function(){openDialogBox('addmember{{collection_item.pk}}');}})
@@ -189,6 +189,8 @@
 {% endif %}
 </script>
 
+<small class="jqgrid_hint"><b>Tip:</b> Use the Gear icon to customize what columns are shown.</small>
+
 {% multiadddialog identifier %}
 
 {% if inactive %}

diff --git a/deme_django/cms/templatetags/item_tags.py b/deme_django/cms/templatetags/item_tags.py
@@ -1083,7 +1083,7 @@ def render(self, context):
               "friendly_name": friendly_name,
               "new_modal_url": new_modal_url,
               "count": relationship_set['count'],
-              "id": "%s_%s" % (item.pk, relationship_set['name'])
+              "id": "%s_%s" % (item.pk, relationship_set['name'].replace(' ','_'))
             })
 
             for related_item in relationship_set['items']:

diff --git a/deme_django/static/css/deme.css b/deme_django/static/css/deme.css
@@ -5466,6 +5466,9 @@ body {
 .ui-jqgrid input.ui-pg-input {
   display: inline;
 }
+.jqgrid_hint {
+  color: #555555;
+}
 .permission_table {
   width: 100%;
 }

diff --git a/deme_django/static/less/deme/ui.jqgrid.less b/deme_django/static/less/deme/ui.jqgrid.less
@@ -28,4 +28,8 @@
   input.ui-pg-input {
     display: inline;
   }
+}
+
+.jqgrid_hint {
+  color: @gray;
 }