Skip to content

Commit

Permalink
Update icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Batiste Bieler committed Jan 7, 2019
1 parent 2a388b7 commit cab24f6
Show file tree
Hide file tree
Showing 18 changed files with 65 additions and 26 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ screenshot_*
*~
.tox
ghostdriver.log
.vscode/
25 changes: 11 additions & 14 deletions pages/static/pages/css/pages.css
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ html[dir=rtl] .change-list-pages tbody .title-cell .title {
background: none;
}
.change-list-pages tbody .title-cell .title:hover {
background: url(../images/icons/edit.gif) right 0.2em no-repeat;
background: url(../images/icons/edit.svg) right 0.2em no-repeat;
}
html[dir=rtl] .change-list-pages tbody .title-cell .title:hover {
background-position: left 0.2em;
Expand Down Expand Up @@ -273,21 +273,18 @@ html[dir=rtl] .change-list-pages .actions-pages a {
display: none;
}
.change-list-pages .actions-pages a.viewlink {
background-image: url(../images/icons/icons.gif);
background-position: -2px -72px;
background-image: url(../images/icons/view.svg);
}
.change-list-pages .actions-pages a.movelink {
background-image: url(../images/icons/icons.gif);
background-position: -2px -60px;
background-image: url(../images/icons/sort.svg);
background-position: -0px -13px;
cursor: all-scroll;
}
.change-list-pages .actions-pages a.deletelink {
background-image: url(../images/icons/icons.gif);
background-position: -2px -12px;
background-image: url(../images/icons/delete.svg);
}
.change-list-pages .actions-pages a.addlink {
background-image: url(../images/icons/icons.gif);
background-position: -2px 0px;
background-image: url(../images/icons/add.svg);
}
.change-list-pages .pagelink-broken {
float: left;
Expand Down Expand Up @@ -435,7 +432,7 @@ html[dir=rtl] .change-list-pages .insert {
background: none;
}
.change-list-pages .language-cell .changelink:hover {
background: url(../images/icons/edit.gif) right 0.2em no-repeat;
background: url(../images/icons/edit.svg) right 0.2em no-repeat;
}
.change-list-pages .language-cell .addlang {
color: #ccc;
Expand All @@ -459,8 +456,8 @@ html[dir=rtl] .change-list-pages .insert {
padding: 5px 10px;
}
.change-list-pages .publish-cell img {
width: 10px;
height: 10px;
width: 14px;
height: 14px;
}
.change-list-pages .publish-cell .publish-select {
margin: 2px;
Expand Down Expand Up @@ -579,8 +576,8 @@ html[dir=rtl] .change-form .sidebar {
}

.module-general .status img, .module-general .field-status img {
width: 10px;
height: 10px;
width: 14px;
height: 14px;
margin-left:4px;
}

Expand Down
3 changes: 3 additions & 0 deletions pages/static/pages/images/icons/add.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed pages/static/pages/images/icons/delete.gif
Binary file not shown.
3 changes: 3 additions & 0 deletions pages/static/pages/images/icons/delete.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed pages/static/pages/images/icons/draft.gif
Binary file not shown.
3 changes: 3 additions & 0 deletions pages/static/pages/images/icons/draft.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions pages/static/pages/images/icons/edit.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions pages/static/pages/images/icons/hidden.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed pages/static/pages/images/icons/published.gif
Binary file not shown.
3 changes: 3 additions & 0 deletions pages/static/pages/images/icons/published.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions pages/static/pages/images/icons/sort.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions pages/static/pages/images/icons/view.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions pages/static/pages/javascript/pages.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ pages.update_published_icon = function (url, select, img, change_status) {
}
$.post(url+'change-status/', {'status':$(select).val()}, function(val) {
img.attr({
'src': img.attr('src').replace('loading.gif', 'icons/'+select_val+'.gif'),
'src': img.attr('src').replace('loading.gif', 'icons/'+select_val+'.svg'),
'alt': select_val
});
});
} else {
img.attr({
'src': img.attr('src').replace('loading.gif', 'icons/'+select_val+'.gif'),
'src': img.attr('src').replace('loading.gif', 'icons/'+select_val+'.svg'),
'alt': select_val
});
}
Expand Down
2 changes: 1 addition & 1 deletion pages/static/pages/javascript/pages_form.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $(function() {
// Set the publication status
var status_select = $('#id_status');
var opt = ({ 0: 'draft', 1: 'published', 2: 'expired', 3: 'hidden' })[status_select.val()];
var img = $('<img src="'+static_url+'pages/images/icons/'+opt+'.gif" alt="'+opt+'" />').insertAfter(status_select);
var img = $('<img src="'+static_url+'pages/images/icons/'+opt+'.svg" alt="'+opt+'" />').insertAfter(status_select);
// disable ajax post if page not already created (add view)
var change_status = (typeof(add_form) !== 'undefined' && add_form) ? 0 : 1;

Expand Down
4 changes: 2 additions & 2 deletions pages/static/pages/javascript/pages_list.js
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ $(function($) {
if(down) {
move_y = start_y - e.pageY;
// we have a drag an drop
if(Math.abs(move_y) > 8 && !drag_initiated) {
if(Math.abs(move_y) > 12 && !drag_initiated) {
indicator = $(".drag-indicator");
indicator.show();
$(".moved-page-title").text(line.find(".title").text());
Expand Down Expand Up @@ -318,7 +318,7 @@ $(function($) {
});

$(document).on("mouseup", function(e) {
if(down == false) {
if(down == false || !choosen_line) {
return;
}

Expand Down
8 changes: 4 additions & 4 deletions pages/templates/admin/pages/page/change_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{% block bodyclass %}{{ block.super }} change-list-pages{% endblock %}

{% block result_list %}
<div id="toolbar">
<div id="toolbar" class="actions">
<form id="changelist-search" action="" method="post">
{% csrf_token %}
<div>
<label for="searchbar"><img src="{% static "pages/img/icon_searchbox.png" %}" alt="{% trans "Search" %}" /></label>
<input type="text" size="25" name="q" value="{{q}}" id="searchbar" />
<input type="submit" name="g" value="{% trans "Go" %}" />
<label for="searchbar"><img src="{% static "admin/img/search.svg" %}" alt="{% trans "Search" %}" /></label>
<input type="text" size="40" name="q" value="{{ q }}" id="searchbar" />
<button type="submit" class="button" name="g">{% trans 'Search' %}</button>
</div>
</form>
</div>
Expand Down
6 changes: 3 additions & 3 deletions pages/templates/admin/pages/page/menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
{% if can_publish %}
<td class="publish-cell">
{% ifequal page.status page.DRAFT %}
<img src="{{ PAGES_STATIC_URL }}images/icons/draft.gif" alt="draft" />
<img src="{{ PAGES_STATIC_URL }}images/icons/draft.svg" alt="draft" />
{% else %}{% ifequal page.status page.PUBLISHED %}
<img src="{{ PAGES_STATIC_URL }}images/icons/published.gif" alt="published" />
<img src="{{ PAGES_STATIC_URL }}images/icons/published.svg" alt="published" />
{% else %}
<img src="{{ PAGES_STATIC_URL }}images/icons/hidden.gif" alt="hidden"/>
<img src="{{ PAGES_STATIC_URL }}images/icons/hidden.svg" alt="hidden"/>
{% endifequal %}{% endifequal %}
&nbsp;
<select class="publish-select" name="select-status-{{ page.id }}">
Expand Down

0 comments on commit cab24f6

Please sign in to comment.