Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff

6 years ago · 4eb943eedc
4 changed files with 23 additions and 4 deletions
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@ -187,11 +187,12 @@ font-size: 12px;
 .ui-tabs-vertical .ui-tabs-nav { padding: .2em .2em .2em .2em; float: left; width: 15em; -webkit-appearance: none;}
 .ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 0 !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; }
 .ui-tabs-vertical .ui-tabs-nav li a { display:block; }
-.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 0; background-color: #A9A9A9}
+.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 0; background-color: #A9A9A9 !important;}
 .ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: left; width: 50em; font-size: 12px;}
 #draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px 10px 10px 0; }
 #droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; }

+
 #newstext{
  width: 100%;
  margin: 0;
@ -307,3 +308,19 @@ box-sizing: border-box;
  font-size: 16px;
  font-style: italic;
 }
+
+.widget {
+  resize: both;
+  overflow: hidden;
+  width: 300px;
+  height: 300px;
+  display: inline-block;
+
+}
+
+.widget iframe {
+
+  width: 100%;
+  height: 100%;
+  border: none;
+}
--- a/app/templates/base.html
+++ b/app/templates/base.html
@ -14,7 +14,6 @@
      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
    <link rel="stylesheet" href="/static/css/style.css">
-    <link rel="stylesheet" href="/static/js/jquery-ui-1.12.1.custom/jquery-ui.css">
    {% block css %} {% endblock%}
  </head>
  <body>
--- a/app/templates/show_stack_detail.html
+++ b/app/templates/show_stack_detail.html
@ -10,7 +10,9 @@

          <li>  <a href="{{url_for('show_book_by_id', id=book.id)}}">{{book.title}}</a> </li>
          <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../static/img/{{ book.cover }}') this.src = '../static/img/default_cover.png';">
-
+<div class='widget'>
+          <iframe src="../uploads/{{ book.file }}" width="50%" ></iframe>
+</div>
    {% endfor %}</p>


@ -21,6 +23,7 @@
  <a href="{{ url_for('edit_stack_by_id', id=stack.id )}}">Edit</a> </p>


+
 <p><a href="{{url_for('show_stacks')}}">Go back to stacks</p>

 </div>
--- a/app/templates/show_stack_detail_tab.html
+++ b/app/templates/show_stack_detail_tab.html
@ -9,7 +9,7 @@



-  <p>Stack description: {{ stack.stack_description }} </p>
+  <p>{{ stack.stack_description }} </p>

  <p>Books in this stack: {% for book in stack.books %}