Merge branch 'master' of https://gitlab.com/Castro0o/iki2Frontend-MMDC

README.md

@@ -10,8 +10,36 @@ Or index all the gaduation works:
 ## template files
 web/page-template.html
 
+
+1) SCRIPTS in buttom of generated pages does not close proberly. And non-relevant scripts are also still in.
+
+should be:
+=========
+
+    <script src="./js/jquery-2.1.3.min.js"></script> 
+    <script src="./js/fixedfixed.js"></script> 
+    <script src="./js/fixedsticky.js"></script> 
+    <script src="./js/mainScripts_single.js"></script> 
+
+is now:
+======
+
+    <script src="./js/jquery-2.1.3.min.js" /> 
+    <script src="./js/fixedfixed.js" /> 
+    <script src="./js/fixedsticky.js" /> 
+    <script src="./js/isotope.pkgd.min.js" /> 
+    <script src="./js/imagesloaded.pkgd.min.js" /> 
+    <script src="./js/mainScripts_single.js" />
+
+2)
+
+
 web/index-template.html
 
+1) FIXED broken img files in index-temlpate: white logo + arrowDown/Up
+
+2)
+
 
 ## To Do
 * add auxiliar JSON creation

web/2015-Luther_Blisset.html

@@ -73,13 +73,10 @@
         </div>
     </div>
 
-    <script src="./js/jquery-2.1.3.min.js" /> 
+    <script src="./js/jquery-2.1.3.min.js"></script> 
-    <script src="./js/fixedfixed.js" /> 
+    <script src="./js/fixedfixed.js"></script> 
-    <script src="./js/fixedsticky.js" /> 
+    <script src="./js/fixedsticky.js"></script> 
-    <script src="./js/isotope.pkgd.min.js" /> 
+    <script src="./js/mainScripts_single.js"></script> 
-    <script src="./js/imagesloaded.pkgd.min.js" /> 
-    <script src="./js/mainScripts_single.js" />
-
 
 
 </body></html>

web/index-template.html

@@ -73,14 +73,14 @@
 	  </div>
 	</div>
 	<div id="logoWrap">
-	  <img id="logo" src="img/black_PZI_logo_p.svg"/>
+	  <img id="logo" src="./img/black_PZI_logo_p.svg"/>
 	</div>
       </div>
 
 
       <div id="section02" class="zwartArea sidebarBorderLeft zwartAreaWhite">
 	<div id="filter" class="fixedsticky">
-          <p>PZI: Master Media Design & Communication <a class="closeSidebar"><img src="arrowDown.svg"/></a></p>
+          <p>PZI: Master Media Design & Communication <a class="closeSidebar"><img src="./img/arrowUp.svg"/></a></p>
 	</div>
 
 	<div class="isotope"> <!-- Maybe sould aslo have have-->

web/index.html

@@ -77,7 +77,7 @@
 
       <div class="zwartArea sidebarBorderLeft zwartAreaWhite" id="section02">
 	<div class="fixedsticky" id="filter">
-          <p>PZI: Master Media Design &amp; Communication <a class="closeSidebar"><img src="arrowDown.svg"></a></p>
+          <p>PZI: Master Media Design &amp; Communication <a class="closeSidebar"><img src="./img/arrowUp.svg"></a></p>
 	</div>
 
 	<div class="isotope"> <!-- Maybe sould aslo have have-->

web/js/fixedsticky.js

@@ -123,7 +123,7 @@
 			if( position.top && isFixedToTop() || position.bottom && isFixedToBottom() ) {
 				if( !isAlreadyOn ) {
 					toggle( true );
-					sidebarOn();
+					// sidebarOn();
 				}
 			} else {
 				if( isAlreadyOn ) {

web/page-template.html

@@ -67,8 +67,6 @@
     <script src='./js/jquery-2.1.3.min.js'></script> 
     <script src='./js/fixedfixed.js'></script> 
     <script src='./js/fixedsticky.js'></script> 
-    <script src='./js/isotope.pkgd.min.js'></script> 
-    <script src='./js/imagesloaded.pkgd.min.js'></script> 
     <script src='./js/mainScripts_single.js'></script>
 
 </body>