changeset 223:5a24611ce4cf

Merge with e8431f86ac709a7225da412458067e68f9bbee89
author casties
date Mon, 28 Oct 2013 18:43:47 +0100
parents 95e0087b9e19 (current diff) e8431f86ac70 (diff)
children 5d17c46ebffa
files
diffstat 2 files changed, 58 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/js/mpiwg.js	Mon Oct 28 18:42:24 2013 +0100
+++ b/js/mpiwg.js	Mon Oct 28 18:43:47 2013 +0100
@@ -90,6 +90,48 @@
    }	); 
 };
 
+function getURLParameter(name) {
+	  return (new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search)||[,""])[1].replace(/\+/g, '%20')||null
+	  
+	}
+
+function openSelected(){
+	// oeffne im folgenden die tags die zur kategorie "open" gehoeren
+	var open = getURLParameter("open");
+	
+	var head = $('#'+open).parent().parent()
+	
+    var img = $(head).find('img');
+	
+	// tag auf level 1 ebene
+	if ($(head).hasClass('fold_head')){
+    var body = $(head).parent().find('.fold_body');
+   
+        body.slideToggle('fast');
+        img.toggle();
+	}
+     
+	//tag auf level 2 ebne
+	if ($(head).hasClass('foldable2')){
+	 
+	 //oeffne erst den darueberliegenden level
+		var par = $(head).parent().parent();
+		var img_level1 = $(head).parent().parent().find('li.fold_head img');
+		
+	 var level1 = par.find('.fold_body');
+	 level1.slideToggle('fast');
+	 img_level1.toggle()
+	 
+	 
+	 //jetzt den level selbst
+     var body2 = $(head).parent().find('.fold_body2');
+        
+        body2.slideToggle('fast');
+        img.toggle();
+	}
+
+}
+
 $(document).ready(function() {
 	/*
 	 * show javascriptonly
@@ -179,8 +221,10 @@
                 $img.toggle();
             }
         }).css('cursor', 'pointer');
+       
     });
     
+    
     /*
      * flyout divs
      * 
@@ -228,5 +272,6 @@
             });
         }).css('cursor', 'pointer');        
     });     
-
+    
+    openSelected();
 }); 
\ No newline at end of file
--- a/zpt/project/project_index_html.zpt	Mon Oct 28 18:42:24 2013 +0100
+++ b/zpt/project/project_index_html.zpt	Mon Oct 28 18:43:47 2013 +0100
@@ -193,7 +193,18 @@
       </div>
     </div>
     <!-- sideblock -->
-
+	 <div class="sideblock" tal:define="tags python:here.thesaurus.getTagsAsHash(here.getId())" tal:condition="tags">
+      <h2>Tags</h2>
+      <div class="item"  tal:define="anc python:here.thesaurus.thes_quote('/en/research/projects/'+here.getId())">
+    
+      <tal:x repeat="key python:tags.keys()">
+      	<tal:y repeat="tag python:tags[key]">
+      		
+      	- <a tal:content="python:here.thesaurus.formatTag(tag)" tal:attributes="href python:'thesaurus/show_en.html?dep='+key+'&open='+here.thesaurus.thes_quote(tag)+'#'+anc">tag</a></tal:y>
+      </tal:x>
+      
+      </div>
+    </div>
   </div>
   <!-- sidebar -->