Changeset aef49cb in firmaeventos for eventos/templates

Timestamp:

Nov 22, 2017, 11:44:56 AM (7 years ago)

Author:

lhernandez <lhernandez@…>

Branches:

master

Children:

2c1cb23, 406146f

Parents:

6312fce (diff), 25ec4a7 (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.detail.html (modified) (1 diff)
• evento.firma.html (modified) (1 diff)
• register.event.html (modified) (2 diffs)

eventos/templates/evento.detail.html

@@ -55 +55 @@
         </iframe>
     </div>
+    <div class="row">
+        <a class="btn waves-effect blue darken-1" href="{% url 'events:list_events' %}" >Regresar</a>
+    </div>
 {% endblock %}

eventos/templates/evento.firma.html

@@ -18 +18 @@
             <div id="datos_paricipante"></div>
         </form>
+        <div class="row" style="padding-top: 25px;">
+            <a class="btn left waves-effect blue darken-1" href="{% url 'events:list_events' %}" >Regresar</a>
+        </div>
     </div>
 {% endblock %}

eventos/templates/register.event.html

@@ -3 +3 @@
 {% block title %}Registrar Evento{% endblock title %}
 {% block extraJs %}
-    <script src="{% static "js/formset.js" %}"></script>
+    <script src="{% static 'js/jquery/jquery-ui.js' %}"></script>
+    <script src="{% static 'js/formset.js' %}"></script>
+    <script src="{% static 'js/pdf.js' %}"></script>
+    <script src="{% static 'js/pdf.worker.js' %}"></script>
+    <script src="{% static 'js/draggable.js' %}"></script>
+    <!-- Coordenadas PDF-->
+    <script src="{% static 'js/DraggableSortable.js' %}"></script>
+    <script src="{% static 'js/docsDraggable.js' %}"></script>
     <script type="text/javascript">
     $(function() {
@@ -78 +85 @@
                 </div>
                 {% include 'base.forms.errors.html' with form_errors=form.archivo.errors col_title_error='col s2' col_msg_error='col s10' %}
+                
             </div>
+            <div id="pdf-main-container" style="display:none;"><center><h5>Configurar Posicion de la Firma</h5></center> 
+                  <div id="pdf-loader2">Cargando documento ...</div>
+                  <div id="pdf-contents2">
+                    <div id="pdf-meta2">
+                      <div id="pdf-buttons2">
+                        <button type="button" id="pdf-prev2" class="btn btn-default btn-sm">
+                          <span class="glyphicon glyphicon-step-backward"></span> 
+                        </button>
+                        <button type="button" id="pdf-next2" class="btn btn-default btn-sm">
+                          <span class="glyphicon glyphicon-step-forward"></span> 
+                        </button>                                
+                      </div>
+                      <div id="page-count-container">Página <div id="pdf-current-page2"></div> de <div id="pdf-total-pages2"></div></div>
+                    </div>
+                    <div class="overflow" >
+                      <div id="container1" class=".cropper-hidden">
+                        <!--<div class="ball blue">sdsa</div>-->
+                      </div>
+                      <br>
+                      <br>
+                    </div>          
+                    </div>
+                    <canvas id="pdf-canvas2" width="500"></canvas>
+                    <div id="page-loader2">Cargando página ...</div>
+              </div>
             <h5>Datos de los Participantes</h5><hr/><br>
             <table class="striped" id="id_orders_table">