Skip to content

Commit

Permalink
updating bs3 library
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikhuang
mikhuang committed Jun 1, 2013
1 parent 11b16ce commit 2f82a81
Show file tree
Hide file tree
Showing 37 changed files with 1,122 additions and 1,665 deletions.
2 changes: 1 addition & 1 deletion deme_django/cms/templates/base_layout.html
View file
Expand Up @@ -182,7 +182,7 @@
<div class="container page-layout">
<div class="row">
<div class="col col-lg-3 sidebar-wrap">
<div class="visible-phone sidebar-toggle-wrap"><a href="#" class="sidebar-toggle"><i class="glyphicon glyphicon-align-justify"></i></a></div>
<div class="visible-sm sidebar-toggle-wrap"><a href="#" class="sidebar-toggle"><i class="glyphicon glyphicon-align-justify"></i></a></div>
{% block logo-section %}
<div class="logo-section">
<a href="/" class="logo {% if cur_site.logo %}img-logo{% endif %}">
Expand Down
2 changes: 1 addition & 1 deletion deme_django/cms/templates/includes/adminbar.html
View file
Expand Up @@ -52,7 +52,7 @@ <h4 class="modal-title"><i class="glyphicon glyphicon-plus-sign"></i> Create a n
</div>
<div class="modal-footer">
<a href="{% url item_type_url viewer="item",action="newother"%}" class="btn btn-primary">Other Items</a>
<a href="#" class="btn" data-dismiss="modal" aria-hidden="true">Close</a>
<a href="#" class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</a>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions deme_django/cms/templates/textdocument/show.html
View file
Expand Up @@ -245,15 +245,15 @@
{% ifagentcan 'view TextDocument.body' item %}
<div id="show_comments_link">
{% ifagentcan 'comment_on' item %}
<button class="btn" href="#" onclick="openCommentDialog('comment{{ item.pk }}'); return false;">Add Comment</button>
<button class="btn btn-default" href="#" onclick="openCommentDialog('comment{{ item.pk }}'); return false;">Add Comment</button>
{% endifagentcan %}
<button class="btn" href="#" onclick="expand_comments_reallybig(); return false;">Show all comments</button>
<button class="btn btn-default" href="#" onclick="expand_comments_reallybig(); return false;">Show all comments</button>
</div>
<div id="hide_comments_link" style="display: none;">
{% ifagentcan 'comment_on' item %}
<button class="btn" href="#" onclick="openCommentDialog('comment{{ item.pk }}'); return false;">Add Comment</button>
<button class="btn btn-default" href="#" onclick="openCommentDialog('comment{{ item.pk }}'); return false;">Add Comment</button>
{% endifagentcan %}
<button class="btn" href="#" onclick="hide_comments_reallybig(); return false;">Hide Comments</button>
<button class="btn btn-default" href="#" onclick="hide_comments_reallybig(); return false;">Hide Comments</button>
</div>

<div id="parse_errors" style="display: none;">
Expand Down
2 changes: 1 addition & 1 deletion deme_django/cms/templatetags/item_tags.py
View file
Expand Up @@ -1769,7 +1769,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;" 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>');
outer_div.append('<div><a href="#" onclick="num_recently_viewed_pages += 10; display_recently_viewed_pages(false, false); return false;" class="btn btn-default">More</a> <a href="#" onclick="num_recently_viewed_pages += 10; display_recently_viewed_pages(false, true); return false;" class="btn btn-default">Clear</a></div>');
});
}
$(function(){
Expand Down
4 changes: 2 additions & 2 deletions deme_django/modules/discussionboard/templates/discussionboard/show.html
View file
Expand Up @@ -4,7 +4,7 @@
{% block content %}

{% ifagentcan 'comment_on' item %}
<p><a href="{% url item_url viewer="discussion",action="newdiscussion",noun=item.pk %}" class="btn">Create a new discussion</a></p>
<p><a href="{% url item_url viewer="discussion",action="newdiscussion",noun=item.pk %}" class="btn btn-default">Create a new discussion</a></p>
{% endifagentcan %}

<table class="table table-striped table-discussion">
Expand Down Expand Up @@ -53,7 +53,7 @@
</table>

{% ifagentcan 'comment_on' item %}
<p><a href="{% url item_url viewer="discussion",action="newdiscussion",noun=item.pk %}" class="btn">Create a new discussion</a></p>
<p><a href="{% url item_url viewer="discussion",action="newdiscussion",noun=item.pk %}" class="btn btn-default">Create a new discussion</a></p>
{% endifagentcan %}

{% endblock content %}
6 changes: 3 additions & 3 deletions deme_django/modules/poll/templates/poll/agreedisagreepoll.html
View file
Expand Up @@ -81,7 +81,7 @@ <h4 class="modal-title">Read More</h4>
<div class="modal-body">
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal" aria-hidden="true">Close</a>
<a href="#" class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</a>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dalog -->
Expand All @@ -95,7 +95,7 @@ <h4 class="modal-title">Read More</h4>
</p>
{% endif %}
{% if cur_agent_can_view_survey or item.allow_editing_responses %}
{% if cur_agent_has_voted and item.allow_editing_responses %}<p><button class="btn" onclick="$(this).parent().remove(); $('.take-survey-wrap').removeClass('hide'); $('.result-wrap').hide(); ">Retake survey</button></p>{% endif %}
{% if cur_agent_has_voted and item.allow_editing_responses %}<p><button class="btn btn-default" onclick="$(this).parent().remove(); $('.take-survey-wrap').removeClass('hide'); $('.result-wrap').hide(); ">Retake survey</button></p>{% endif %}
<div class="take-survey-wrap{% if cur_agent_has_voted and item.allow_editing_responses %} hide{% endif %}">

<script type="text/javascript">
Expand Down Expand Up @@ -169,7 +169,7 @@ <h5>Personal statement (optional):</h5>
<!-- admin -->
<p>
{% ifagentcanglobal 'create Proposition' %}
<a class="btn" href="{% url item_type_url viewer='proposition',action='new'%}?populate_poll={{ item.pk }}&amp;add_to_collection={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Add a Proposition</a>
<a class="btn btn-default" href="{% url item_type_url viewer='proposition',action='new'%}?populate_poll={{ item.pk }}&amp;add_to_collection={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Add a Proposition</a>
{% endifagentcanglobal %}
{% ifagentcan 'modify_membership' item %}
<!--a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all" onclick="openDialog('addmember{{ item.pk }}'); return false;">Add Existing Proposition to Poll</a-->
Expand Down

0 comments on commit 2f82a81

Please sign in to comment.