Skip to content

Commit

Permalink
attempting to style approvenpoll
Browse files Browse the repository at this point in the history
  • Loading branch information
mikhuang committed Apr 17, 2013
1 parent b01c6d4 commit ee529ba
Show file tree
Hide file tree
Showing 10 changed files with 255 additions and 318 deletions.
13 changes: 7 additions & 6 deletions deme_django/cms/templates/default_layout.html
Expand Up @@ -211,9 +211,9 @@
</div>
</div>
<div class="row">
<div class="col-span-3" class="sidebar-section">
<div class="col-span-3 sidebar-section">
{% block sidebar-section %}
<div class="panel">
<div class="panel recently-viewed">
<div class="panel-heading">
Recently Viewed
</div>
Expand Down Expand Up @@ -246,15 +246,16 @@ <h4>Permissions Error</h4>
</div>
{% endif %}

<div class="title">
{% block title %}

{% block title %}
<h1 class="title">
{% if item %}
<img src="{{ item.actual_item_type|icon_url:24 }}" title="{% item_type_verbose_name item %}" /> {% viewable_name item %}{% if action_title %} &raquo; {{ action_title }}{% endif %}
{% else %}
<img src="{{ accepted_item_type|icon_url:24 }}" title="{% item_type_verbose_name accepted_item_type %}" /> {% if action_title %}{{ action_title }}{% else %}{{ accepted_item_type_name_plural|capfirst }}{% endif %}
{% endif %}
{% endblock title %}
</div>
</h1>
{% endblock title %}

<div class="content">
{% block content %}
Expand Down
2 changes: 1 addition & 1 deletion deme_django/cms/templatetags/item_tags.py
Expand Up @@ -1856,7 +1856,7 @@ def render(self, context):
var title = datum[1];
outer_div.append('<div><a href="' + url + '">' + title + '</a></div>');
});
outer_div.append('<div><a href="#" onclick="num_recently_viewed_pages += 10; display_recently_viewed_pages(false, false); return false;">[More]</a> <a href="#" onclick="num_recently_viewed_pages += 10; display_recently_viewed_pages(false, true); return false;">[Clear]</a></div>');
outer_div.append('<div><a href="#" onclick="num_recently_viewed_pages += 10; display_recently_viewed_pages(false, false); return false;" class="btn">More</a> <a href="#" onclick="num_recently_viewed_pages += 10; display_recently_viewed_pages(false, true); return false;" class="btn">Clear</a></div>');
});
}
$(function(){
Expand Down

0 comments on commit ee529ba

Please sign in to comment.