From f96b8944410d38c989fad7a1108efc384117964b Mon Sep 17 00:00:00 2001
From: Castro0o <andre@andrecastro.info>
Date: Sun, 7 Jun 2015 21:41:09 +0200
Subject: [PATCH] resolving details

---
 index-template.html           | 10 ++++++++--
 mmdc_wiki2web.py              |  8 +++++---
 page-template.html            |  2 +-
 web/css/style.css             |  6 ++++--
 web/css/style_projectpage.css | 15 ++++++++++++++-
 web/js/mainScripts_single.js  |  4 ++--
 6 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/index-template.html b/index-template.html
index b9cb193..1dbc036 100644
--- a/index-template.html
+++ b/index-template.html
@@ -35,6 +35,9 @@
 	    <p class="highlight">
 	      (Text on Gradshow 2015)
 	    </p>
+	    <h1 class="highlight">Preview Party: Tempted by Tomorrow (Nervous About Tonight)</h1><p><s>This evening will be filled with performances, presentations and installations. It will be an opportunity to discuss the projects that have been produced. And, it is an event to learn more about the student’s current work, have a drink and decide on who should be the winner of ‘Thesis – Karaoke’, the ultimate research based pop-jukebox. Join us for an evening off media cabaret at V2.</s></p>
+
+	    
 	  </div>
 	</div>
       </div>
@@ -47,8 +50,11 @@
 	    <div id="sideBarDescInner">
 	      <h2>Graduation Show 2015: Tempted by Tomorrow</h2> 
               <!--p>(Text on Gradshow 2015)</p-->	      
-	      <p class="hightlightSidebar">Gradshow DATES, LOCATION</p>
-	      <p>Work by: <br>
+	      <p class="hightlightSidebar">(Gradshow DATES, LOCATION)</p>
+
+	      <p class="hightlightSidebar">Preview Party: Tempted by Tomorrow (Nervous About Tonight). Saturday, 20 June 2015 19:00 <a href="index.html">V2_</a></p>
+
+	      <p>
 		Mihail Bakalov (BG) <br>
 		Caetano Carvalho (BR) <br>
 		Junyu Chen (CN) <br> 
diff --git a/mmdc_wiki2web.py b/mmdc_wiki2web.py
index 6edf20e..a7bf2ed 100755
--- a/mmdc_wiki2web.py
+++ b/mmdc_wiki2web.py
@@ -5,7 +5,7 @@ import xml.etree.ElementTree as ET
 import html5lib, urllib, pprint
 from mmdc_modules import pandoc2html, parse_work, write_html_file, mw_cats, mw_page_imgsurl, mw_img_url, mw_page_text, mwsite, mw_page_cats, mw_page, remove_cats, find_authors, replace_video, replace_img_a_tag, index_addwork
 from argparse import ArgumentParser
-from random import shuffle as shuffle
+from random import shuffle
 
 #####
 # Args
@@ -97,7 +97,9 @@ def create_index(indexdict):
     index_template = open("index-template.html", "r") 
     index_tree = html5lib.parse(index_template, namespaceHTMLElements=False)
     index_container = index_tree.find(".//div[@class='isotope']") #maybe id is imp    
-    for key in indexdict.keys():    
+    keys = indexdict.keys()
+    shuffle(keys)
+    for key in keys:    
         index_addwork( parent=index_container,
                        workid=key,
                        href=indexdict[key]['Path'],
@@ -124,7 +126,7 @@ if args.preview is not None:
 else:
     print "** New Index Mode **"
     memberpages=mw_cats(site, args)
-    shuffle(memberpages)
+#    memberpages
     print 'memberpages:', memberpages
     indexdict = create_page(memberpages, 'index')
     create_index(indexdict)
diff --git a/page-template.html b/page-template.html
index 6db16bc..7d0f677 100644
--- a/page-template.html
+++ b/page-template.html
@@ -48,7 +48,7 @@
         <div class="zwartArea zwartAreaWhite sidebarBorderLeft" id="section02">
             <div class="fixedsticky" id="filter" style="top:0;">
               <div class="themes" id="sortArea">
-		<a href="index.html" class="hoverBackB">
+		<a href="../index.html" class="hoverBackB">
 		  <img class="template" src="../img/arrowBack.svg">
 		</a>
 		<p></p><!--{title}-->
diff --git a/web/css/style.css b/web/css/style.css
index 00405fb..73f6ceb 100644
--- a/web/css/style.css
+++ b/web/css/style.css
@@ -31,6 +31,8 @@ h2 {
   margin: 0;
 }
 
+a:visited { color:black}
+
 .hiddenOverflow{
   position: fixed; 
   overflow-y:scroll;
@@ -536,7 +538,7 @@ label{
   }
 
   #filter{
-    font-size: 20px;
+      font-size: 20px;
   }
 }
 
@@ -562,7 +564,7 @@ label{
   }
 
   #filter{
-    font-size: 16px;
+      font-size: 16px;
   }
 
   #sideBarDescInfo p {
diff --git a/web/css/style_projectpage.css b/web/css/style_projectpage.css
index 829f06c..003dcdc 100644
--- a/web/css/style_projectpage.css
+++ b/web/css/style_projectpage.css
@@ -14,6 +14,12 @@ h2 {
   margin: 0;
 }
 
+figure {
+    max-width: 100%;
+    margin: 0;
+    padding: 0;
+  }
+
 #creator {
   border-bottom: 0;
   padding-bottom: 0;
@@ -175,6 +181,7 @@ h2 {
   padding: 10px;
   max-width: 600px;
   max-height: 600px;
+  display:block;
 }
 
 .project h1,
@@ -265,11 +272,17 @@ iframe {
     margin-top: 50px;
   }
 
-  .project img {
+  .project#extra {
+     padding-left: 30px !important;
+
+  }
+
+  .project img figure {
     max-width: 100%;
     padding: 10px 0 10px 0;
   }
 
+  
   iframe {
     border: none;
     max-width: 100%;
diff --git a/web/js/mainScripts_single.js b/web/js/mainScripts_single.js
index 4c51a09..0492235 100644
--- a/web/js/mainScripts_single.js
+++ b/web/js/mainScripts_single.js
@@ -85,10 +85,10 @@ $(".closeSidebar").click(function(){
   $("#sidebarInner").slideToggle()
   if(slideLock == false){
     slideLock = true
-    $(".closeSidebar").html('<img src="./img/arrowDownW.svg"/>')
+    $(".closeSidebar").html('<img src="../img/arrowDownW.svg"/>')
   }else{
     slideLock = false
-    $(".closeSidebar").html('<img src="./img/arrowUpW.svg"/>')
+    $(".closeSidebar").html('<img src="../img/arrowUpW.svg"/>')
   }
 });