Merge pull request #23 from softvis-research/13-gdpr-compliance

puts gdpr and imprint-links on each page

Author: naraesk

evaluationserver/app/views/application/_navbar_gdpr_links.html.erb

@@ -0,0 +1,4 @@
+<li><%= link_to t(:privacy_declaration, scope: :layout), "http://home.uni-leipzig.de/svis/privacy-policy/", target: :_blank %></li>
+<li><%= link_to t(:imprint, scope: :layout), "http://home.uni-leipzig.de/svis/impressum/", target: :_blank %></li>
+
+	 

evaluationserver/app/views/layouts/_blank_header.html.erb

@@ -13,6 +13,9 @@
 
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+		  <ul class="nav navbar-nav navbar-right">
+				<%= render :partial => "navbar_gdpr_links" %>
+		  </ul>
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->
 </nav>

evaluationserver/app/views/layouts/_header.html.erb

@@ -29,7 +29,8 @@
         </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><%= link_to t(:admin_off, scope: :layout), admin_mode_off_path %></li>
+			 <%= render :partial => "navbar_gdpr_links" %>
+			 <li><%= link_to t(:admin_off, scope: :layout), admin_mode_off_path %></li>
       </ul>
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->

evaluationserver/app/views/layouts/_navbar_header.html.erb

@@ -14,8 +14,10 @@
 
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right">
-		  <% if content_for?(:remarks) %>
+        <ul class="nav navbar-nav navbar-right">
+				<%= render :partial => "navbar_gdpr_links" %>
+
+			 <% if content_for?(:remarks) %>
 		  <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Remarks<span class="caret"></span></a>
 			 <ul class="dropdown-menu" role="menu">

evaluationserver/app/views/layouts/_simple_header.html.erb

@@ -18,6 +18,7 @@
 		  <li><%= link_to t(:experiments, scope: :layout), experiments_path %></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
+			 <%= render :partial => "navbar_gdpr_links" %>
         <li><%= link_to t(:admin_on, scope: :layout), admin_mode_on_path %></li>
       </ul>
     </div><!-- /.navbar-collapse -->

evaluationserver/config/locales/de.yml

@@ -157,6 +157,8 @@ de:
    successful_created: "Fragebogen erfolgreich erfolgt"
    successful_updated: "Fragebogen erfolgreich aktualisiert"
   layout:
+    privacy_declaration: "Datenschutzerklärung"
+    imprint: "Impressum"
     experiments: "Experimente"
     scenes: "Szenen"
     steps: "Schritte"

evaluationserver/config/locales/en.yml

@@ -155,6 +155,8 @@ en:
     successful_created: "Questionaire successful created"
     successful_updated: "Questionaire successful updated"
   layout:
+    privacy_declaration: "Privacy Policy"
+    imprint: "Imprint"
     experiments: "Experiments"
     scenes: "Scenes"
     other: "Other"