Browse Source

layout finalized.

Signed-off-by: root <root@ipekatrinadei.ipe.kit.edu>
root 6 years ago
parent
commit
1b676c4745
2 changed files with 46 additions and 33 deletions
  1. 17 5
      static/fossil/css/style.css
  2. 29 28
      templates/index.html

+ 17 - 5
static/fossil/css/style.css

@@ -222,11 +222,11 @@ hr {
 
 #text-desc {
     float: left;
-	padding-left: 5%;
-	font-family: 'Quicksand';
+    margin-top: 30px;
+    font-family: 'Quicksand';
 	font-size: 15px;
-	width: 50%;
-	height: 300px;
+	width: 100%;
+    text-align: left;
 }
 
 #details {
@@ -269,6 +269,18 @@ hr {
 
 #image-text {
     margin: 0 30px 0 30px;
+	font-family: 'Quicksand';
+}
+
+#image-container {
+    margin: 30px 0 30px 0;
+}
+
+#footer {
+    text-align: center;
+    margin-bottom: 10px;
+    color: #aaa;
+    font-size: 12px;
 }
 
 #slider-left,
@@ -314,4 +326,4 @@ hr {
 
 #download:hover {
     background-color: #ddd;
-}
+}

+ 29 - 28
templates/index.html

@@ -75,24 +75,33 @@
     <div id="image-container" class="clearfix">
         <div id="img-left">
             <div class="cont">
-                <img class="icon" src="{{ static_url("img/icon/left-arrow.svg") }}"/>
-	            <span id="image-text">LEFT: <span>1</span></span>
-                <img class="icon" src="{{ static_url("img/icon/right-arrow.svg") }}"/>
+	            <span id="image-text">Overview (Volume Rendering)</span>
             </div>
 	        <div class="photowrapper">
-                <img src="img?id={{ index }}&name={{ name }}&type=left-resized&counter=0"/>
+                <img src="img?id={{ index }}&name={{ name }}&type=preview&counter=0"/>
+            <div id="text-desc">
+            <p><span>Description</span>
+                {% for text_desc in desc %}
+                    {% if text_desc['type'] == "i" %}
+                        <i>{{ text_desc['text'] }}</i>
+                    {% else %}
+                        {{ text_desc['text'] }}
+                    {% end %}
+                {% end %}
+                
+            </p>
+            </div>
             </div>
-	        <div id="slider-left"></div>
         </div>
 
         <div id="img-right">
             <div class="cont">
                 <img class="icon" src="{{ static_url("img/icon/left-arrow.svg") }}"/>
-	            <span id="image-text">FRONT: <span>3</span></span>
+	            <span id="image-text">Front: <span>1</span></span>
                 <img class="icon" src="{{ static_url("img/icon/right-arrow.svg") }}"/>
             </div>
 	        <div class="photowrapper">
-                <img src="img?id={{ index }}&name={{ name }}&type=top-resized&counter=0"/>
+                <img src="img?id={{ index }}&name={{ name }}&type=front-resized&counter=0"/>
             </div>
 	        <div id="slider-right"></div>
         </div>
@@ -100,35 +109,27 @@
         <div id="img-center">
             <div class="cont">
                 <img class="icon" src="{{ static_url("img/icon/left-arrow.svg") }}"/>
-	            <span id="image-text">TOP: <span>2</span></span>
+	            <span id="image-text">Top: <span>1</span></span>
                 <img class="icon" src="{{ static_url("img/icon/right-arrow.svg") }}"/>
             </div>
 	        <div class="photowrapper">
-                <img src="img?id={{ index }}&name={{ name }}&type=front-resized&counter=0"/>
+                <img src="img?id={{ index }}&name={{ name }}&type=top-resized&counter=0"/>
             </div>
 	        <div id="slider-center"></div>
+            <div class="cont">
+                <img class="icon" src="{{ static_url("img/icon/left-arrow.svg") }}"/>
+	            <span id="image-text">Left: <span>1</span></span>
+                <img class="icon" src="{{ static_url("img/icon/right-arrow.svg") }}"/>
+            </div>
+	        <div class="photowrapper">
+                <img src="img?id={{ index }}&name={{ name }}&type=left-resized&counter=0"/>
+            </div>
+	        <div id="slider-left"></div>
         </div>
     </div>
-    
-    <div id="text-block">
-        <div id="text-desc">
-            <p><span>Description</span>
-                {% for text_desc in desc %}
-                    {% if text_desc['type'] == "i" %}
-                        <i>{{ text_desc['text'] }}</i>
-                    {% else %}
-                        {{ text_desc['text'] }}
-                    {% end %}
-                {% end %}
-                
-            </p>
-        </div>
-        <div id="details">
-            <p><span>Overview</span></p>
-            <img src="img?id={{ index }}&name={{ name }}&type=preview&counter=0"/>
-        </div>
-    </div>
+    <hr>
 
+    <div id="footer">&copy;2017 A service provided by Ultra-fast Online Processing for Data-intensive Sciences group (UFO)</div>
 <script src="{{ static_url("js/jquery-1.12.4.min.js") }}"></script>
 <script src="{{ static_url("js/jquery-ui.min.js") }}"></script>
 <script src="{{ static_url("js/script.js") }}"></script>