diff options
| author | jpope777 <jpope@jpope.org> | 2014-01-07 20:40:12 -0600 |
|---|---|---|
| committer | jpope777 <jpope@jpope.org> | 2014-01-07 20:40:12 -0600 |
| commit | b2de5021c6bc12d4970e4db843e4e4b18605318e (patch) | |
| tree | 9e38579345847eaaaac38c741c94f44ce98f2683 /mediagoblin/templates | |
| parent | ab6cb466172fc3c8f960953b4a4d2724a6610041 (diff) | |
| parent | 1469f432fca34f7eccac25cc0037d156bd0c3cb0 (diff) | |
| download | mediagoblin-b2de5021c6bc12d4970e4db843e4e4b18605318e.tar.lz mediagoblin-b2de5021c6bc12d4970e4db843e4e4b18605318e.tar.xz mediagoblin-b2de5021c6bc12d4970e4db843e4e4b18605318e.zip | |
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
Diffstat (limited to 'mediagoblin/templates')
5 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html index 3fbea3be..d1e33c47 100644 --- a/mediagoblin/templates/mediagoblin/edit/attachments.html +++ b/mediagoblin/templates/mediagoblin/edit/attachments.html @@ -57,7 +57,7 @@ <h2>{% trans %}Add attachment{% endtrans %}</h2> {{- wtforms_util.render_divs(form) }} <div class="form_submit_buttons"> - <a href="{{ media.url_for_self(request.urlgen) }}"> + <a class="button_action" href="{{ media.url_for_self(request.urlgen) }}"> {%- trans %}Cancel{% endtrans -%} </a> <input type="submit" value="{% trans %}Save changes{% endtrans %}" diff --git a/mediagoblin/templates/mediagoblin/edit/delete_account.html b/mediagoblin/templates/mediagoblin/edit/delete_account.html index 84d0b580..a7a3c3d2 100644 --- a/mediagoblin/templates/mediagoblin/edit/delete_account.html +++ b/mediagoblin/templates/mediagoblin/edit/delete_account.html @@ -41,7 +41,7 @@ 'mediagoblin.user_pages.user_home', user=user.username) }}">{% trans %}Cancel{% endtrans %}</a> {{ csrf_token }} - <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form" /> + <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form button_warning" /> </div> </div> </form> diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html index 694eb979..209cd491 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html +++ b/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html @@ -45,7 +45,7 @@ {{- collection.url_for_self(request.urlgen) }}"> {%- trans %}Cancel{% endtrans -%} </a> - <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form" /> + <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form button_warning" /> {{ csrf_token }} </div> </div> diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html b/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html index dc31d90f..cb4fd1a2 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html +++ b/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html @@ -51,7 +51,7 @@ {{- collection_item.in_collection.url_for_self(request.urlgen) }}"> {%- trans %}Cancel{% endtrans -%} </a> - <input type="submit" value="{% trans %}Remove{% endtrans %}" class="button_form" /> + <input type="submit" value="{% trans %}Remove{% endtrans %}" class="button_form button_warning" /> {{ csrf_token }} </div> </div> diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html index 1d7dcc17..c948ccec 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html @@ -46,7 +46,7 @@ <div class="form_submit_buttons"> {# TODO: This isn't a button really... might do unexpected things :) #} <a class="button_action" href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a> - <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form" /> + <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form button_warning" /> {{ csrf_token }} </div> </div> |