Index: prototipo/index.html
===================================================================
--- prototipo/index.html	(revision eb89313dc69273e3f3f3945f3b0c45e95a6474b8)
+++ prototipo/index.html	(revision e3349ca5d808e4692974ebc92855a42d7ce7bbbd)
@@ -61,19 +61,8 @@
           </li>
           <li>
-            <a href="#">Page 1</a>
+            <a href="https://tibisay.cenditel.gob.ve/murachi">Wiki</a>
           </li>
           <li>
-            <a href="#">Page 2</a>
-          </li>
-          <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
-            <ul class="dropdown-menu">
-              <li><a href="#">Action</a></li>
-              <li><a href="#">Another action</a></li>
-              <li><a href="#">Something else here</a></li>
-            </ul>
-          </li>
-          <li>
-            <a href="#">Contact</a>
+            <a href="#">Contacto</a>
           </li>
         </ul>
@@ -114,28 +103,45 @@
           <nav>
           <ul class="nav">
-<!--      
-            <li><a href="#" id="btn-1" class="list-group-item list-group-item-success" data-toggle="collapse" data-target="#submenu1" >Sign</a>
-                <ul class="nav collapse" id="submenu1" role="menu" aria-labelledby="btn-1">
-                    <div class="col-sm-4">
-                       <button type="button" id="upload-button" class="btn btn-success btn-sm">
-                          <span class="glyphicon glyphicon-open"></span> Select PDF
-                       </button>                    
-                      <input type="file" id="file-to-upload" accept="application/pdf" />
-                    </div>
+
+            <li><a href="#" id="btn-1" class="list-group-item list-group-item-success" data-toggle="collapse" data-target="#firma_visible" >Firma visible en PDF <span class="glyphicon glyphicon-chevron-down"></span></a>      
+                <ul class="nav collapse" id="firma_visible" role="menu" aria-labelledby="btn-1">
+                  <div class="col-sm-12" id="firma_visible">
+                    <li><a href="#" id="btn-1" class="list-group-item list-group-item-info" data-toggle="collapse" data-target="#pdf" >PDF <span class="glyphicon glyphicon-chevron-down"></span></a>
+
+                    </li> 
+                        <ul class="nav collapse" id="pdf" role="menu" aria-labelledby="btn-1">
+                          <div class="col-sm-12" id="pdf">
+                            <li><a href="#" id="btn-1" class="list-group-item list-group-item-link" data-toggle="collapse" data-target="#Formato_Visible" >Firma Visible <span class="glyphicon glyphicon-chevron-down"></span></a>
+                            </li> 
+                              <ul class="nav collapse" id="Formato_Visible" role="menu" aria-labelledby="btn-1">
+                                  <div class="col-sm-4" id="Formato_Visible">
+                                     <button type="button" id="upload-button2" class="btn btn-success btn-sm">
+                                        <span class="glyphicon glyphicon-open"></span>Cargar
+                                     </button>
+                                      <input type="file" id="file-to-upload2" accept="application/pdf" />
+                                      <div class="text imagen" id="texto"></div>
+                                  </div>
+                              </ul>                            
+                            <li><a href="#" id="btn-1" class="list-group-item list-group-item-link" data-toggle="collapse" data-target="#Formato_Normal">Firma Normal <span class="glyphicon glyphicon-chevron-down"></span></a>
+                              <ul class="nav collapse" id="Formato_Normal" role="menu" aria-labelledby="btn-1">
+                                  <div class="col-sm-4" id="Formato_Normal">
+                                     <button type="button" id="upload-Normal" class="btn btn-success btn-sm">
+                                        <span class="glyphicon glyphicon-open"></span>Cargar
+                                     </button>
+                                      <input type="file" id="file-to-normal" accept="application/pdf" />
+
+                                  </div>
+                              </ul>                            
+                            </li>                    
+                          </div>
+                        </ul>
+
+                    <li><a href="#" id="btn-1" class="list-group-item list-group-item-info" data-toggle="collapse" data-target="#bdoc" >BDOC</a>
+                    </li>                    
+                  </div>
                 </ul>
-            </li>
--->
-
-            <li><a href="#" id="btn-1" class="list-group-item list-group-item-success" data-toggle="collapse" data-target="#submenu2" >Firma visible en PDF</a>
-                <ul class="nav collapse" id="submenu2" role="menu" aria-labelledby="btn-1">
-                    <div class="col-sm-4" id="submenu2">
-                       <button type="button" id="upload-button2" class="btn btn-success btn-sm">
-                          <span class="glyphicon glyphicon-open"></span>Cargar
-                       </button>
-                        <input type="file" id="file-to-upload2" accept="application/pdf" />
-                        <div class="text imagen" id="texto"></div>
-                    </div>
-                </ul>
-            </li>            
+                
+            </li>  
+
             
             <li><a href="#" id="btn-1" class="list-group-item list-group-item-success" data-toggle="collapse" data-target="#submenu2" >Verificar PDF</a>
@@ -146,5 +152,7 @@
                        </button>
                         <input type="file" id="file-to-upload2" accept="application/pdf" />
-                        <div class="text imagen" id="texto"></div>
+                        <div id="etiquet">
+                          <div class="text imagen" id="texto"></div>
+                        </div>
                     </div>
                 </ul>
@@ -193,31 +201,7 @@
       ================================================== -->
       <div class="col-sm-8">
-<!--      
-         <div class="well">
-            <div id="pdf-main-container">
-              <div id="pdf-loader">Cargando documento ...</div>
-              <div id="pdf-contents">
-                <div id="pdf-meta">
-                  <div id="pdf-buttons">
-                    <button type="button" id="pdf-prev" class="btn btn-default btn-sm">
-                      <span class="glyphicon glyphicon-step-backward"></span> 
-                    </button>
-                    <button type="button" id="pdf-next" 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-page"></div> de <div id="pdf-total-pages"></div></div>
-                </div>
-                
-                <img id = "img-1" />
-                <div id="page-loader">Cargando página ...</div>
-              </div>
-            </div>         
-        </div>
--->        
-        <canvas id="pdf-canvas" width="500"></canvas> 
-
+     
         <div class="well">
-          <div id="pdf-main-container">
+          <div id="pdf-main-container"><center>Firma Visible</center> 
             <div id="pdf-loader2">Cargando documento ...</div>
             <div id="pdf-contents2">
@@ -233,14 +217,40 @@
                 <div id="page-count-container">Página <div id="pdf-current-page2"></div> de <div id="pdf-total-pages2"></div></div>
               </div>
-              <div id="container1" class=".cropper-hidden">
-                <!--<div class="ball blue">sdsa</div>-->
-              </div>
-              
-              </div>
+              <div style="position: relative; overflow: auto; width: 100%;">
+                <div id="container1" class=".cropper-hidden">
+                  <!--<div class="ball blue">sdsa</div>-->
+                </div>
+              </div>
+              </div>
+              <canvas id="pdf-canvas2" width="500"></canvas>
               <div id="page-loader2">Cargando página ...</div>
             </div>
-          </div>
-        </div>
-        <canvas id="pdf-canvas2" width="500"></canvas>
+            <div id="pdf-main-container2"><center>Firma Normal</center> 
+              <div id="pdf-loader3">Cargando documento ...</div>
+              <div id="pdf-contents3">
+                <div id="pdf-meta3">
+                  <div id="pdf-buttons3">
+                    <button type="button" id="pdf-prev3" class="btn btn-default btn-sm">
+                      <span class="glyphicon glyphicon-step-backward"></span> 
+                    </button>
+                    <button type="button" id="pdf-next3" class="btn btn-default btn-sm">
+                      <span class="glyphicon glyphicon-step-forward"></span> 
+                    </button>                                
+                  </div>
+                  <div id="page-count-container3">Página <div id="pdf-current-page3"></div> de <div id="pdf-total-pages3"></div></div>
+                </div>
+                <div style="position: relative; overflow: auto; width: 100%;">
+                  <div id="container2" class=".cropper-hidden">
+                    <!--<div class="ball blue">sdsa</div>-->
+                  </div>
+                </div>
+                </div>
+                <canvas id="pdf-canvas3" width="500"></canvas>
+                <div id="page-loader3">Cargando página ...</div>
+              </div>
+
+        </div>
+      </div>
+        
         <!--############ well-->
 
@@ -276,4 +286,5 @@
   <script src="static/js/jquery/jquery-ui.js"></script>
   <script src="static/js/docsDraggable.js"></script>
+  <script src="static/js/docFirmaNormal.js"></script>
 </body>
 </html>
Index: prototipo/static/css/style.css
===================================================================
--- prototipo/static/css/style.css	(revision e3adbd34d52876d593c636868cc46181771e485b)
+++ prototipo/static/css/style.css	(revision e3349ca5d808e4692974ebc92855a42d7ce7bbbd)
@@ -1,3 +1,3 @@
-#upload-button, #upload-button2 {
+#upload-button, #upload-button2, #upload-Normal {
   width: 150px;
   display: block;
@@ -7,5 +7,5 @@
 }
 
-#file-to-upload, #file-to-upload2 {
+#file-to-upload, #file-to-upload2, #file-to-normal{
   display: none;
 }
@@ -14,7 +14,8 @@
   width: 700px;
   margin: 30px auto;
+  display: none;
 }
 
-#pdf-loader, #pdf-loader2 {
+#pdf-loader, #pdf-loader2, #pdf-loader3 {
   display: none;
   text-align: center;
@@ -29,31 +30,31 @@
 }
 
-#pdf-meta {
+#pdf-meta #pdf-meta3 {
   overflow: hidden;
   margin: 0 0 20px 0;
 }
 
-#pdf-buttons, #pdf-buttons2 {
+#pdf-buttons, #pdf-buttons2, #pdf-buttons3 {
   float: left;
 }
 
-#page-count-container {
+#page-count-container,  #page-count-container3{
   float: right;
 }
 
-#pdf-current-page, #pdf-current-page2 {
+#pdf-current-page, #pdf-current-page2, #pdf-current-page3 {
   display: inline;
 }
 
-#pdf-total-pages, #pdf-total-pages2 {
+#pdf-total-pages, #pdf-total-pages2, #pdf-total-pages3 {
   display: inline;
 }
 
-#pdf-canvas, #pdf-canvas2 {
+#pdf-canvas, #pdf-canvas2 #pdf-canvas3 {
   border: 1px solid rgba(0,0,0,0.2);
   box-sizing: border-box;
 }
 
-#page-loader, #page-loader2 {
+#page-loader, #page-loader2, #page-loader3 {
   height: 100px;
   line-height: 100px;
@@ -86,5 +87,5 @@
 
 
-#container1 {
+#container1, #container2 {
   bottom: 35%;
   left: 80px;
@@ -117,5 +118,5 @@
 
 
-#pdf-prev2 { 
+#pdf-prev2, #pdf-prev3 { 
   padding: 10px;
   margin-left: 5px;
@@ -124,5 +125,5 @@
 
 
-#pdf-next2 { 
+#pdf-next2, #pdf-next3 { 
   padding: 10px;
   margin-left: 5px;
@@ -144,2 +145,9 @@
  }
 
+
+
+
+
+/*.menu_lateral {
+    position: fixed;
+}*/
Index: prototipo/static/js/docFirmaNormal.js
===================================================================
--- prototipo/static/js/docFirmaNormal.js	(revision e3349ca5d808e4692974ebc92855a42d7ce7bbbd)
+++ prototipo/static/js/docFirmaNormal.js	(revision e3349ca5d808e4692974ebc92855a42d7ce7bbbd)
@@ -0,0 +1,133 @@
+
+var __PDF_DOC,
+  __CURRENT_PAGE,
+  __TOTAL_PAGES,
+  __PAGE_RENDERING_IN_PROGRESS = 0,
+  __CANVAS = $('#pdf-canvas3').get(0),
+  __CANVAS_CTX = __CANVAS.getContext('2d'),
+  __idd = "",
+  __NUMBER = 0;
+
+ $("#pdf-canvas3").hide();
+
+function showPDF3(pdf_url) {
+  $("#pdf-loader3").show();
+
+  PDFJS.getDocument({ url: pdf_url }).then(function(pdf_doc) {
+    __PDF_DOC = pdf_doc;
+    __TOTAL_PAGES = __PDF_DOC.numPages;
+    
+    // Hide the pdf loader and show pdf container in HTML
+    $("#pdf-loader3").hide();
+    $("#pdf-contents3").show();
+    $("#pdf-total-pages3").text(__TOTAL_PAGES);
+
+    // Show the 
+      showPage3(1);
+  
+  }).catch(function(error) {
+    // If error re-show the upload button
+    $("#pdf-loadere").hide();
+    $("#upload-buttone").show();
+    
+    alert(error.message);
+  });;
+}
+
+function showPage3(page_no) {
+  __PAGE_RENDERING_IN_PROGRESS = 1;
+  __CURRENT_PAGE = page_no;
+
+  // Disable Prev & Next buttons while page is being loaded
+  $("#pdf-next3, #pdf-prev3").attr('disabled', 'disabled');
+
+  // While page is being rendered hide the canvas and show a loading message
+  $("#pdf-canvas3").hide();
+  $("#page-loader3").show();
+
+  // Update current page in HTML
+  $("#pdf-current-page3").text(page_no);
+  
+  
+  // Fetch the page
+  __PDF_DOC.getPage(page_no).then(function(page) {
+    // As the canvas is of a fixed width we need to set the scale of the viewport accordingly
+
+
+    var scale_required = __CANVAS.width / page.getViewport(1).width;
+
+    // Get viewport of the page at required scale
+    var viewport = page.getViewport(scale_required);
+
+    // Set canvas height
+
+    __CANVAS.height = viewport.height;
+
+
+    var renderContext = {
+      canvasContext: __CANVAS_CTX,
+      viewport: viewport
+    };
+
+
+    // Render the page contents in the canvas
+    page.render(renderContext).then(function() {
+      __PAGE_RENDERING_IN_PROGRESS = 0;
+
+      // Re-enable Prev & Next buttons
+      $("#pdf-next3, #pdf-prev3").removeAttr('disabled');
+
+      // Show the canvas and hide the page loader
+      $("#page-loader3").hide();
+
+        __idd = __CANVAS.toDataURL()
+       
+      var viewdimen = page.getViewport(1);
+      console.log( "Width: " + viewdimen.width + ", Height: " + viewdimen.height);      
+
+      $("#container2").attr("style", "background-image: url('"+__idd+"');background-size: cover; background-repeat: no-repeat;  height:"+viewdimen.height+"px; width:"+viewdimen.width+"px");      
+
+    });
+  });
+
+}
+
+
+// Previous page of the PDF
+$("#pdf-prev3").on('click', function() {
+  if(__CURRENT_PAGE != 1)
+    showPage3(--__CURRENT_PAGE);
+});
+
+// Next page of the PDF
+$("#pdf-next3").on('click', function() {
+    
+  if(__CURRENT_PAGE != __TOTAL_PAGES)
+    
+    showPage3(++__CURRENT_PAGE);
+
+});
+
+
+
+$("#upload-Normal").on('click', function() {
+  $("#pdf-main-container").hide();
+  $("#pdf-main-container2").show();  
+
+  $("#file-to-normal").trigger('click');
+});
+
+
+$("#file-to-normal").on('change', function() {
+
+  // Validate whether PDF
+    if(['application/pdf'].indexOf($("#file-to-normal").get(0).files[0].type) == -1) {
+        alert('Error : Not a PDF');
+        return;
+    }
+
+
+
+  showPDF3(URL.createObjectURL($("#file-to-normal").get(0).files[0]));
+
+});
Index: prototipo/static/js/docsDraggable.js
===================================================================
--- prototipo/static/js/docsDraggable.js	(revision eb89313dc69273e3f3f3945f3b0c45e95a6474b8)
+++ prototipo/static/js/docsDraggable.js	(revision e3349ca5d808e4692974ebc92855a42d7ce7bbbd)
@@ -85,7 +85,6 @@
       var viewdimen = page.getViewport(1);
       console.log( "Width: " + viewdimen.width + ", Height: " + viewdimen.height);      
-      
-      $("#container1").attr("style", "background-image: url('"+__id+"');background-size: cover; background-repeat: no-repeat;  height:"+(viewdimen.height+40)+"px; width:"+(viewdimen.width+100)+"px");
-      
+
+      $("#container1").attr("style", "background-image: url('"+__id+"');background-size: cover; background-repeat: no-repeat;  height:"+viewdimen.height+"px; width:"+viewdimen.width+"px");      
 
     });
@@ -101,4 +100,7 @@
   //$("#img").removeAttr('class');
   //$(".cropper-container").remove();
+  $("#pdf-main-container2").hide(); 
+  $("#pdf-main-container").show(); 
+
   $("#file-to-upload2").trigger('click');
 
@@ -113,5 +115,4 @@
         return;
     }
-
 
 
@@ -188,5 +189,5 @@
         num+= 1;
         if (num == 1){
-          $("#submenu2 #submenu2 .text").hide();
+          $("#firma_visible #Formato_Visible .text").hide();
           $('#dataX').val(0);
           $('#dataY').val(0);
