Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of ssh://githany/projects/content/GIT/ella

  • Loading branch information...
commit 0ff149c66c1a9f46d88341bf741ebcd273a2be0a 2 parents 8841c0c + bcc398e
Jonas Fiala authored
64 ella/newman/media/css/frontend-tools.css
View
@@ -1,46 +1,22 @@
-div.fe-admin-toolbar {
- position: fixed;
- top:0;
- left:0;
- right:0;
- z-index:3000;
- background-color: rgba(0,0,0,.85);
- /*background-color: #d6d614;*/
- color: #fff;padding: 6px;
- font: normal normal 10px Tahoma, Verdana, sans-serif;
- text-align: left;
- line-height: 1.4em;
-}
-
-.fe-admin-toolbar .listings {
- font-size: 110%;
-}
-
-.fe-admin-toolbar .listings-container {
- float: right;
-}
-
-.fe-admin-toolbar p {
- margin-bottom: .5em;
-}
+.fe-admin-toolbar {
+ position: fixed; top:0; left:0; right:0; z-index:3000;
+ padding: 6px;
+ font: normal normal 10px Tahoma, Verdana, sans-serif;
+ color: #fff;
+ text-align: left;
+ line-height: 1.4em;
+ background-color: #000; filter:alpha(opacity=85); opacity: 0.85; -moz-opacity:0.85;
+}
+.fe-admin-toolbar .toolbar { max-width: 600px;}
+.fe-admin-toolbar p { line-height: 1.4em; padding-bottom: 0.2em; }
+.fe-admin-toolbar strong { font-weight: bold; }
+.fe-admin-toolbar .listings { font-size: 110%; }
+.fe-admin-toolbar .listings-container { float: right; }
+.fe-admin-toolbar a { color: #fff; font-weight: bold; }
+.fe-admin-toolbar a:hover { text-decoration: none; }
+.fe-admin-toolbar a.newman-logout-button { color: #ffcccc; }
+.fe-admin-toolbar a.newman-edit-button { font-size: 1.2em; color: #c5ffc8; }
-.fe-admin-toolbar .toolbar {
- max-width: 500px;
-}
-
-.fe-admin-toolbar a {
- color: #fff;
- font-weight: bold;
- margin-left: 3px;
- margin-right: 3px;
-}
-
-div.fe-admin-toolbar strong, div.fe-admin-toolbar b { font-weight: bold; }
button.icn { padding: 3px; }
-button.icn span {
- padding: 3px 3px 3px 20px;
- background: url(../ico/16/ok.png) 0 50% no-repeat;
-}
-button.icn.logout span {
- background-image: url(../ico/16/logout.png);
-}
+button.icn span { padding: 3px 3px 3px 20px; background: url(../ico/16/ok.png) 0 50% no-repeat; }
+button.icn.logout span { background-image: url(../ico/16/logout.png); }
22 ella/newman/templates/newman/tpl_tags/newman_frontend_admin.html
View
@@ -1,11 +1,10 @@
{% load newman_frontend_tags %}
<div class="fe-admin-toolbar">
<div class="toolbar">
-
-<p>Přihlášen/a jako admin:
- <strong style="font-weight:bold">{{ user.get_full_name }}</strong>
- (<a id="js-newman-logout-button" href="{% newman_frontend_logout %}"><strong>odhlásit</strong></a>)
-</p>
+ <p>
+ Uživatel/ka: <strong>{{ user.get_full_name }}</strong>
+ (<a href="{{ newman_index_url }}">přejít do adminu</a> | <a id="js-newman-logout-button" class="newman-logout-button" href="{% newman_frontend_logout %}">odhlásit se</a>)
+ </p>
{% if object %}
@@ -14,7 +13,7 @@
<div class="listings-container">
<ul class="listings">
<li><p>
- publikováno od: <strong style="font-weight:bold">{{ object.publish_from|date:"d.m.Y H:i:s" }}</strong>
+ publikováno od: <strong>{{ object.publish_from|date:"d.m.Y H:i:s" }}</strong>
</p></li>
{% for l in placement.listing_set.all %}
<li><p>{{ l.publish_from|date:"d.m.Y H:i:s" }} | {{ l.category }}</p></li>
@@ -37,14 +36,13 @@
<p>
{% if object.content_type %}
{% trans object.content_type.name %}:
- <strong style="font-weight:bold">{{ object }}</strong>,
- návštěv: <strong style="font-weight:bold">{{ hitcount.hits }}</strong>
+ <strong>{{ object }}</strong>,
+ zobrazení: <strong>{{ hitcount.hits }}</strong>
{% endif %}
</p>
- <div style="float: right;">
- <button onclick="location.href='{{ newman_object_url }}'"><span>Edituj</span></button>
- </div>
+ <p><a class="newman-edit-button" href="{{ newman_object_url }}">Editovat článek</a></p>
+
{% endif %}
@@ -59,4 +57,4 @@
{# NEWMAN_MEDIA_URL #}
</div>
-</div>
+</div>
Please sign in to comment.
Something went wrong with that request. Please try again.