浏览代码

isos open in tab works now

bscheibel 4 年之前
父节点
当前提交
8d946e4a93
共有 3 个文件被更改,包括 23 次插入14 次删除
  1. 18 1
      app/static/js/js_libs/ui.js
  2. 4 12
      app/templates/index.html
  3. 1 1
      app/views.py

+ 18 - 1
app/static/js/js_libs/ui.js

@@ -43,19 +43,36 @@ function ui_add_tab(tabbed,title,id,closeable,additionalclasses) {
     return false;
   } else {
     var instab = $("<ui-tab class='inactive" + (closeable ? ' closeable' : '') + (additionalclasses == '' ? '' : ' ' + additionalclasses) + "' data-tab='" + id + "'>" + title + "</ui-tab>");
-    var insarea = $("<ui-area data-belongs-to-tab='" + id + "' class='inactive'></ui-area>");
+    var insarea = $("<ui-area data-belongs-to-tab='" + id + "' class='inactive' id="+ id +"></ui-area>");
     $(tabbed).find('ui-behind').before(instab);
     $(tabbed).find('ui-content').append(insarea);
     ui_add_close($('ui-tabbar ui-tab[data-tab=' + id + ']'));
     return true;
   }
 }
+
+function create_new_tab(title, id) {
+    console.log(title,id);
+    var theDiv = document.getElementById(id);
+    var content = document.createTextNode(id);
+    var content = document.createTextNode(id);
+    var newElement = document.createElement('div');
+    newElement.setAttribute('id', id);
+    newElement.innerHTML = "<iframe width=100% height=1000px src= '/static/isos/" + id  + ".PDF')'> </iframe>";
+    theDiv.appendChild(content);
+    theDiv.appendChild(newElement);
+    return true;
+}
+
 function ui_add_tab_active(tabbed,title,id,closeable,additionalclasses) {
   var state = ui_add_tab(tabbed,title,id,closeable,additionalclasses);
+  if (state) { create_new_tab(title, id); }
   if (state) { ui_activate_tab($('ui-tabbar ui-tab[data-tab=' + id + ']')); }
   return state;
 }
 
+
+
 function ui_clone_tab(tabbar,original,title,id,closeable,additionalclasses) {
   additionalclasses = typeof additionalclasses !== 'undefined' ? additionalclasses : '';
   var instab = $("<ui-tab class='inactive" + (closeable ? ' closeable' : '') + (additionalclasses == '' ? '' : ' ' + additionalclasses) + "' data-tab='" + id + "' id='tab_" + id + "'>" + title + "</ui-tab>");

+ 4 - 12
app/templates/index.html

@@ -54,7 +54,7 @@
               <ui-before>
                 <a class="logo" href="/"> </a>
               </ui-before>
-              <ui-tab class="" data-tab="drawing" >Drawing
+              <ui-tab class="default" data-tab="drawing" >Drawing
 
               </ui-tab>
 
@@ -62,33 +62,24 @@
             </ui-tabbar>
          <!--</ui-rest>-->
           <ui-content>
-              <ui-area data-belongs-to-tab="drawing">
+              <ui-area data-belongs-to-tab="drawing" >
                   <div class="images">
                   <img  class="optcontent" id="drawing" src="{{ url_for('send_file', filename=filename) }}" alt="Drawing">
                   </div>
 
               </ui-area>
 
-
-          <ui-area data-belongs-to-tab="iso" class="optcontent inactive ">
-                TEEEEESST
-
-
-          </ui-area>
           </ui-content>
         </ui-area>
 
         <ui-resizehandle data-label="drag to resize"></ui-resizehandle>
         <ui-area id="detailcolumn1" data-minsize="20em">
           <h3 style="text-align:left"> Regulatory Documents</h3>
+            <div id="dat_details" class='x-ui-layout'>
             <table style='text-align:left'>
-
-              <div id="dat_details" class='x-ui-layout'>
                 <tr>
                   {{ html_links | safe }}
                 </tr>
-              </div>
-
 
             {% for iso in isos_names %}
             <tr>
@@ -96,6 +87,7 @@
              </tr>
             {% endfor %}
         </table>
+            </div>
 
           <div id="measurements">
                 <font >

+ 1 - 1
app/views.py

@@ -136,7 +136,7 @@ def uploaded_file(filename, uuid):
 
 
                 for x in relevant_isos:
-                    html_code += "<td style='text-align:center'> <a href=" + url_for('static', filename="isos/"+x) + " >"+ x.partition(".")[0]  +"</a>  </td>"
+                    html_code += "<td style='text-align:left'> <a href=" + url_for('static', filename="isos/"+x) + " >"+ x.partition(".")[0]  +"</a>  </td>"
                 #print(html_code)
         return render_template('show_image_old_working.html', filename=file_out, isos=isos, dims=dims, text=html_code, number=number_blocks, og_filename=filename, w=w, h=h, links=links)