Changeset 8ec4f0b in firmaeventos for eventos/templates

Timestamp:

Nov 21, 2017, 4:21:37 PM (7 years ago)

Author:

lhernandez <lhernandez@…>

Branches:

master

Children:

e334152, ccec96a

Parents:

b48da64 (diff), b84cfca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/cenditel-desarrollo/FirmaEventos

Location:

eventos/templates

Files:

• evento.firma.html (modified) (2 diffs)
• evento.list.html (modified) (3 diffs)
• register.event.html (modified) (1 diff)

eventos/templates/evento.firma.html

@@ -13 +13 @@
             </div>
             
-            <a type="button" class="btn waves-effect red darken-1" onclick="get_event_user()">
+            <a type="button" class="btn waves-effect blue darken-1" onclick="get_event_user()">
                 <i class="material-icons left">search</i> Buscar
             </a>
@@ -20 +20 @@
     </div>
 {% endblock %}
+{% block extraJs %}
+    <script type="text/javascript" src="{% static "plugins/hwcrypto/gitversion.js"  %}"></script>
+    <script type="text/javascript" src="{% static "plugins/hwcrypto/hwcrypto-legacy.js"  %}"></script>
+    <script type="text/javascript" src="{% static "plugins/hwcrypto/hwcrypto.js"  %}"></script>
+    <script type="text/javascript" src="{% static "plugins/hwcrypto/hex2base.js"  %}"></script> 
+{% endblock %}

eventos/templates/evento.list.html

@@ -5 +5 @@
     <h1 class="center">Eventos</h1><hr>
     
-    <div class="row content">
-        <a type="button" class="btn waves-effect btn red darken-1 right" href="{% url 'events:create_events' %}">
-            <i class="material-icons left">add_circle</i> Registrar Nuevo Evento</a>
-    </div>
+    {% if request.user.is_authenticated %}
+        <div class="row content">
+            <a type="button" class="btn waves-effect btn blue darken-1 right" href="{% url 'events:create_events' %}">
+                <i class="material-icons left">add_circle</i> Registrar Nuevo Evento</a>
+        </div>
+    {% endif %}
     
     {% for evento in object_list %}
@@ -19 +21 @@
             </div>
             <div class="card-action">
-                <a type="button" class="btn waves-effect red darken-1" href="">
+                <a type="button" class="btn waves-effect blue darken-1" href="">
                     <i class="material-icons left">search</i> Detalle
                 </a>
-                <a type="button" class="btn waves-effect red darken-1" href="{% url 'events:firma_events' evento.id %}">
+                <a type="button" class="btn waves-effect blue darken-1" href="{% url 'events:firma_events' evento.id %}">
                     <i class="material-icons left">mode_edit</i> Firmar
                 </a>
@@ -32 +34 @@
     {% include 'base.paginator.html' with paginator=page_obj %}
     <div style="padding-bottom: 50px;">
-        <a type="button" class="btn waves-effect btn red darken-1" href="{% url 'base:inicio' %}">Regresar</a>
+        <a type="button" class="btn waves-effect btn blue darken-1" href="{% url 'base:inicio' %}">Regresar</a>
     </div>
 {% endblock %}

eventos/templates/register.event.html

@@ -112 +112 @@
             </table>
             <div>
-                <button type="submit" class="btn waves-effect red darken-1">Registrar</button>
+                <button type="submit" class="btn waves-effect blue darken-1">Registrar</button>
             </div>
             </div>