Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-12 01:03:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merging from ui update branch

Browse source
This commit is contained in:
Dave Cranwell 2014-02-05 12:14:14 +00:00
parent ed7535c4fd
commit 04953427c8
6 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
View file

@ -9,14 +9,9 @@
width:48%;
float:left;
border:1px solid @color-grey-4;
border-width:1px 1px 0px 1px;
border-width:0px 1px;
background-color:@color-grey-5;
border-top:0.3em solid @color-grey-3;
&.active{
background-color:white;
border-top:0.3em solid @color-grey-1;
}
margin-right:2px;
}
a{
outline:none;
@ -29,15 +24,17 @@
padding:0 20px;
color:@color-grey-2;
border-bottom:1px solid transparent;
border-top:0.3em solid @color-grey-3;
&:hover{
color:inherit;
border-top-color:@color-grey-3;
}
}
li.active a{
background-color:white;
border-top:0.3em solid @color-grey-1;
border-bottom:2px solid white;
margin-bottom:-1px;
}

1
wagtail/wagtailadmin/static/wagtailadmin/css/core.less
View file

@ -339,6 +339,7 @@ img{
.row();
border-top:40px solid @color-grey-5; /* this top border provides space for the floating logo to toggle the menu */
padding-bottom:4em;
position:relative; /* yuk. necessary for positions for jquery ui widgets */
}
body.nav-open .nav-wrapper{

8
wagtail/wagtailredirects/templates/wagtailredirects/add.html
View file

@ -1,23 +1,21 @@
{% extends "wagtailadmin/base.html" %}
{% block titletag %}Add redirect{% endblock %}
{% block bodyclass %}menu-redirects{% endblock %}
{% block content %}
{% include "wagtailadmin/shared/header.html" with title="Add redirect" %}
<form action="{% url 'wagtailredirects_add_redirect' %}" method="POST">
<form action="{% url 'wagtailredirects_add_redirect' %}" method="POST" class="nice-padding">
{% csrf_token %}
{{ edit_handler.render_form_content }}
<div class="nice-padding">
<div>
<input type="submit" value="Save" />
</div>
</form>
{% endblock %}
{% block extra_css %}
{% include "wagtailadmin/pages/_editor_css.html" %}
{% endblock %}
{% block extra_js %}
{% include "wagtailadmin/pages/_editor_js.html" %}
{% endblock %}

2
wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% block bodyclass %}menu-redirects{% endblock %}
{% block titletag %}Delete redirect {{ redirect.title }}{% endblock %}
{% block content %}

8
wagtail/wagtailredirects/templates/wagtailredirects/edit.html
View file

@ -1,14 +1,15 @@
{% extends "wagtailadmin/base.html" %}
{% block bodyclass %}menu-redirects{% endblock %}
{% block titletag %}Editing {{ redirect.title }}{% endblock %}
{% block content %}
{% include "wagtailadmin/shared/header.html" with title="Editing" subtitle=redirect.title %}
<form action="{% url 'wagtailredirects_edit_redirect' redirect.id %}" method="POST">
<form action="{% url 'wagtailredirects_edit_redirect' redirect.id %}" method="POST" class="nice-padding">>
{% csrf_token %}
{{ edit_handler.render_form_content }}
<div class="nice-padding">
<div>
<input type="submit" value="Save" />
<a href="{% url 'wagtailredirects_delete_redirect' redirect.id %}" class="button button-secondary no">Delete redirect</a>
</div>
@ -16,9 +17,6 @@
{% endblock %}
{% block extra_css %}
{% include "wagtailadmin/pages/_editor_css.html" %}
{% endblock %}
{% block extra_js %}
{% include "wagtailadmin/pages/_editor_js.html" %}
{% endblock %}

5
wagtail/wagtailredirects/templates/wagtailredirects/index.html
View file

@ -1,9 +1,10 @@
{% extends "wagtailadmin/base.html" %}
{% block titletag %}Redirects{% endblock %}
{% block bodyclass %}page-explorer{% endblock %}
{% block bodyclass %}menu-redirects{% endblock %}
{% block content %}
{% include "wagtailadmin/shared/header.html" with title="Redirects" add_link="wagtailredirects_add_redirect" add_text="Add redirect" %}
{% include "wagtailadmin/shared/header.html" with title="Redirects" merged=1 add_link="wagtailredirects_add_redirect" add_text="Add redirect" %}
<table class="listing full-width">
<col />