Skip to content

Commit

Permalink
New export action box on admin #31
Browse files Browse the repository at this point in the history
  • Loading branch information
Scisco committed Dec 17, 2014
1 parent b67a5cd commit 043c76f
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 11 deletions.
8 changes: 8 additions & 0 deletions pillbox-engine/pillbox/templatetags/pillbox_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ def pillbox_widgets():
'color': 'primary',
'action': '/pillbox/status/'
},
{
'icon': 'fa-sign-out',
'name': 'Export',
'text': 'Check Export Status',
'link': '#',
'color': 'red',
'action': '/pillbox/export_status/'
},
{
'icon': 'fa-arrows-h ',
'name': 'Add New',
Expand Down
28 changes: 20 additions & 8 deletions pillbox-engine/static/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -66,44 +66,56 @@
}

/* line 53, ../sass/app.scss */
.widget-footer {
cursor: pointer;
cursor: hand;
text-decoration: underline;
color: #5cb85c;
}
/* line 58, ../sass/app.scss */
.widget-footer:hover {
color: #3d8b3d;
}

/* line 63, ../sass/app.scss */
.panel-green {
border-color: #5cb85c;
}
/* line 55, ../sass/app.scss */
/* line 65, ../sass/app.scss */
.panel-green .panel-heading {
border-color: #5cb85c;
color: #fff;
background-color: #5cb85c;
}
/* line 60, ../sass/app.scss */
/* line 70, ../sass/app.scss */
.panel-green a {
color: #5cb85c;
}
/* line 63, ../sass/app.scss */
/* line 73, ../sass/app.scss */
.panel-green a:hover {
color: #3d8b3d;
}

/* line 67, ../sass/app.scss */
/* line 77, ../sass/app.scss */
.panel-red {
border-color: #d9534f;
}
/* line 69, ../sass/app.scss */
/* line 79, ../sass/app.scss */
.panel-red .panel-heading {
border-color: #d9534f;
color: #fff;
background-color: #d9534f;
}
/* line 74, ../sass/app.scss */
/* line 84, ../sass/app.scss */
.panel-red a {
color: #d9534f;
}
/* line 77, ../sass/app.scss */
/* line 87, ../sass/app.scss */
.panel-red a:hover {
color: #b52b27;
}

/* line 82, ../sass/app.scss */
/* line 92, ../sass/app.scss */
.progress {
background-color: #CCCCCC;
}
1 change: 0 additions & 1 deletion pillbox-engine/static/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ $(document).ready(function() {
}

$('.widget-footer').click(function(event) {
event.preventDefault();
var action = $(this).data('action');
var that = $(this);
changeButton(that, 'refresh');
Expand Down
10 changes: 10 additions & 0 deletions pillbox-engine/static/sass/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,16 @@
}
}

.widget-footer {
cursor: pointer;
cursor: hand;
text-decoration: underline;
color: #5cb85c;
&:hover {
color: #3d8b3d;
}
}

.panel-green {
border-color: #5cb85c;
.panel-heading {
Expand Down
2 changes: 0 additions & 2 deletions pillbox-engine/templates/pillbox-engine/tags/widgets.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
</div>
</div>
</div>
<a href="{{box.link}}">
<div class="panel-footer widget-footer" data-action="{{box.action}}">
<div class="widget-progress {% if not box.meta %} hide {% endif %}">
<div class="task-name">{{box.meta.file}}</div>
Expand All @@ -28,7 +27,6 @@
<span class="pull-right"><i class="fa {% if box.status %} fa-refresh {% else %} fa-arrow-circle-right {% endif %}"></i></span>
<div class="clearfix"></div>
</div>
</a>
</div>
</div>
{% endfor %}

0 comments on commit 043c76f

Please sign in to comment.