Skip to content

Commit

Permalink
fixing admin bar buttons to rely on classnames instead of titles, fix…
Browse files Browse the repository at this point in the history 
…ed buttons not being removed appropriately, rigged comment button, fixed visual padding on angle brackets for breadcrumb
  • Loading branch information
@mikhuang
mikhuang committed Apr 16, 2013
1 parent 3013e84 commit 6147982
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 17 deletions.
6 changes: 3 additions & 3 deletions deme_django/cms/templates/includes/adminbar.html
View file
Expand Up @@ -40,9 +40,9 @@
{% actionsmenu %}
</ul>
</li>
<li><a href="#" title="Create"><i class="glyphicon glyphicon-plus-sign"></i></a></li>
<li><a href="#" title="Edit"><i class="glyphicon glyphicon-edit"></i></a></li>
<li><a href="#" title="Comment"><i class="glyphicon glyphicon-comment"></i></a></li>
<li><a href="#" title="Create" class="create"><i class="glyphicon glyphicon-plus-sign"></i></a></li>
<li><a href="#" title="Edit" class="edit"><i class="glyphicon glyphicon-edit"></i></a></li>
<li><a href="#" title="Comment" class="comment"><i class="glyphicon glyphicon-comment"></i></a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" title="Account"><i class="glyphicon glyphicon-user"></i></a>
<ul class="dropdown-menu login-menu">
Expand Down
20 changes: 10 additions & 10 deletions deme_django/cms/templatetags/item_tags.py
View file
Expand Up @@ -380,26 +380,26 @@ def render(self, context):
list_items = []
if item:
if agentcan_global_helper(context, 'create Membership'):
list_items.append("""<li><a href="#" onclick="openCommentDialog('additemtocollection%s'); return false;" tabindex="-1" title="Add to collection"><i class="demeicon demeicon-add-collection"></i> Add to collection</a></li>""" % (item.pk))
list_items.append("""<li><a href="#" onclick="openCommentDialog('additemtocollection%s'); return false;" tabindex="-1" title="Add to collection" class="add-to-collection"><i class="demeicon demeicon-add-collection"></i> Add to collection</a></li>""" % (item.pk))
if isinstance(item, Agent):
if agentcan_helper(context, 'add_authentication_method', item):
list_items.append('<li><a href="%s" tabindex="-1"><span class="ui-icon ui-icon-circle-plus"></span>Add authentication method</a></li>' % add_authentication_method_url)
list_items.append('<li><a href="%s" tabindex="-1" class="add-authentication-method"><span class="ui-icon ui-icon-circle-plus"></span>Add authentication method</a></li>' % add_authentication_method_url)
if agentcan_helper(context, 'add_contact_method', item):
list_items.append('<li><a href="%s" tabindex="-1"><span class="ui-icon ui-icon-circle-plus"></span>Add contact method</a></li>' % add_contact_method_url)
list_items.append('<li><a href="%s" tabindex="-1" class="add-contact-method"><span class="ui-icon ui-icon-circle-plus"></span>Add contact method</a></li>' % add_contact_method_url)
if not context['cur_agent'].is_anonymous():
list_items.append("""<li><a href="#" onclick="openCommentDialog('subscribe_dialog'); return false;" tabindex="-1"><i class="glyphicon glyphicon-envelope"></i> Subscribe</a></li>""")
list_items.append("""<li><a href="#" onclick="openCommentDialog('subscribe_dialog'); return false;" tabindex="-1" class="subscribe"><i class="glyphicon glyphicon-envelope"></i> Subscribe</a></li>""")
if agentcan_helper(context, 'edit ', item, wildcard_suffix=True):
list_items.append('<li><a href="%s" tabindex="-1" title="Edit"><i class="glyphicon glyphicon-edit"></i> Edit</a></li>' % edit_url)
list_items.append('<li><a href="%s" tabindex="-1" title="Edit" class="edit"><i class="glyphicon glyphicon-edit"></i> Edit</a></li>' % edit_url)
if agentcan_global_helper(context, 'create %s' % item.item_type_string):
list_items.append('<li><a href="%s" tabindex="-1" title="Copy"><i class="demeicon demeicon-copy"></i> Copy</a></li>' % copy_url)
list_items.append('<li><a href="%s" tabindex="-1" title="Copy" class="copy"><i class="demeicon demeicon-copy"></i> Copy</a></li>' % copy_url)
if item.can_be_deleted() and agentcan_helper(context, 'delete', item):
if item.active:
list_items.append("""<li><a href="#" onclick="$('#deactivate_dialog').dialog('open'); return false;" tabindex="-1" title="Deactivate"><i class="glyphicon glyphicon-trash"></i> Deactivate</a></li>""")
list_items.append("""<li><a href="#" onclick="$('#deactivate_dialog').dialog('open'); return false;" tabindex="-1" title="Deactivate" class="deactivate"><i class="glyphicon glyphicon-trash"></i> Deactivate</a></li>""")
else:
list_items.append("""<li><a href="#" onclick="$('#reactivate_dialog').dialog('open'); return false;" tabindex="-1" title="Reactivate"><i class="glyphicon glyphicon-trash"></i> Reactivate</a></li>""")
list_items.append("""<li><a href="#" onclick="$('#destroy_dialog').dialog('open'); return false;" tabindex="-1" title="Destroy"><i class="glyphicon glyphicon-trash"></i> Destroy</a></li>""")
list_items.append("""<li><a href="#" onclick="$('#reactivate_dialog').dialog('open'); return false;" tabindex="-1" title="Reactivate" class="reactivate"><i class="glyphicon glyphicon-trash"></i> Reactivate</a></li>""")
list_items.append("""<li><a href="#" onclick="$('#destroy_dialog').dialog('open'); return false;" tabindex="-1" title="Destroy" class="destroy"><i class="glyphicon glyphicon-trash"></i> Destroy</a></li>""")
if agentcan_global_helper(context, 'create', wildcard_suffix=True):
list_items.append("""<li><a href="#" onclick="toggleNewItemMenu('HiddenNewItemMenu'); return false;" tabindex="-1" title="Create"><i class="glyphicon glyphicon-plus-sign"></i> Create</a></li>""")
list_items.append("""<li><a href="#" onclick="toggleNewItemMenu('HiddenNewItemMenu'); return false;" tabindex="-1" title="Create" class="create"><i class="glyphicon glyphicon-plus-sign"></i> Create</a></li>""")

if not list_items:
return ''
Expand Down
2 changes: 2 additions & 0 deletions deme_django/static/css/deme.css
View file
Expand Up @@ -4758,10 +4758,12 @@ you can use the generic selector below, but it's slower:
background-repeat: no-repeat;
background-position: right center;
border: 0;
padding-right: 20px;
}
.adminbar .nav.breadcrumbs > li:last-child > a,
.adminbar .nav.breadcrumbs > li:last-child > span {
background-image: none;
padding-right: 10px;
border-right: 1px solid rgba(0, 0, 0, 0.15);
}
.adminbar .login-menu .current-user {
Expand Down
7 changes: 3 additions & 4 deletions deme_django/static/javascripts/deme/adminbar.js
View file
Expand Up @@ -41,21 +41,20 @@ $(function(){

// set up create, edit, and comment buttons based on existing markup elsewhere
function linkOrRemove(dependent, target) {
if (target) {
if (target.length > 0) {
dependent.click(function(e){
e.preventDefault();
if (target.attr('href') == '#') {
target.click();
} else {
window.location = target.attr('href');
}

});
} else {
dependent.remove();
}
}
linkOrRemove($('.actions-wrap > li > a[title="Create"]'), $('.actions-menu a[title="Create"]'));
linkOrRemove($('.actions-wrap > li > a[title="Edit"]'), $('.actions-menu a[title="Edit"]'));
linkOrRemove($('.actions-wrap > li > a.create'), $('.actions-menu a.create'));
linkOrRemove($('.actions-wrap > li > a.edit'), $('.actions-menu a.edit'));

});
9 changes: 9 additions & 0 deletions deme_django/static/javascripts/deme/metabar.js
View file
Expand Up @@ -108,4 +108,13 @@ $(function(){
collapse.addClass('ajax-loaded');
}
}


// set up comment button
$('.actions-wrap > li > a.comment').click(function(){
// open metadata menu
toggleMetabar('open');
// load and open comments in metadata
metabar_show_section($("#metadata_content_comments"));
});
});
2 changes: 2 additions & 0 deletions deme_django/static/less/deme/adminbar.less
View file
Expand Up @@ -59,9 +59,11 @@
background-repeat: no-repeat;
background-position: right center;
border: 0;
padding-right: 20px;
}
&:last-child > a, &:last-child > span {
background-image: none;
padding-right: 10px;
border-right: 1px solid fade(@black, 15%);
}
}
Expand Down

0 comments on commit 6147982

Please sign in to comment.