From a3436ee17284d32af0f2e51f670c4b7b15012c58 Mon Sep 17 00:00:00 2001
From: Adrian Moennich <adrian.moennich@cern.ch>
Date: Fri, 17 Jul 2015 15:39:37 +0200
Subject: [PATCH] Add some missing preventDefault calls

---
 indico/MaKaC/webinterface/tpls/CategoryDisplay.tpl           | 3 ++-
 indico/MaKaC/webinterface/tpls/ConfDetailsFull.tpl           | 3 ++-
 indico/MaKaC/webinterface/tpls/ContributionDisplayMin.tpl    | 3 ++-
 indico/MaKaC/webinterface/tpls/MaterialDisplay.tpl           | 5 +++--
 indico/MaKaC/webinterface/tpls/SessionDisplayFull.tpl        | 3 ++-
 indico/MaKaC/webinterface/tpls/SubContributionDisplayMin.tpl | 3 ++-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/indico/MaKaC/webinterface/tpls/CategoryDisplay.tpl b/indico/MaKaC/webinterface/tpls/CategoryDisplay.tpl
index 559ae1b9d..8e7ee8dc9 100644
--- a/indico/MaKaC/webinterface/tpls/CategoryDisplay.tpl
+++ b/indico/MaKaC/webinterface/tpls/CategoryDisplay.tpl
@@ -240,7 +240,8 @@ $(document).ready(function(){
 % if isLoggedIn:
     <script type="text/javascript">
         $(document).ready(function(){
-            $("#manageMaterial").click(function(){
+            $("#manageMaterial").click(function(e){
+                e.preventDefault();
                 openAttachmentManager(${categ.getLocator() | n,j});
             });
 
diff --git a/indico/MaKaC/webinterface/tpls/ConfDetailsFull.tpl b/indico/MaKaC/webinterface/tpls/ConfDetailsFull.tpl
index c58a3a88c..11a3b1e1a 100644
--- a/indico/MaKaC/webinterface/tpls/ConfDetailsFull.tpl
+++ b/indico/MaKaC/webinterface/tpls/ConfDetailsFull.tpl
@@ -147,7 +147,8 @@ ${ actions }
     $('.infoline.material').append('<span title="${_("Manage materials")}" class="right i-button icon-edit icon-only" style="float: right" id="manageMaterials" aria-hidden="true" ></span>');
 
 
-    $("#manageMaterials").click(function(){
+    $("#manageMaterials").click(function(e){
+        e.preventDefault();
         openAttachmentManager(${conf.getLocator() | n,j});
     });
 
diff --git a/indico/MaKaC/webinterface/tpls/ContributionDisplayMin.tpl b/indico/MaKaC/webinterface/tpls/ContributionDisplayMin.tpl
index 6ed344a29..01a60edce 100644
--- a/indico/MaKaC/webinterface/tpls/ContributionDisplayMin.tpl
+++ b/indico/MaKaC/webinterface/tpls/ContributionDisplayMin.tpl
@@ -161,7 +161,8 @@
     </div>
 </div>
 <script type="text/javascript">
-    $("#manageMaterial").click(function(){
+    $("#manageMaterial").click(function(e){
+        e.preventDefault();
         openAttachmentManager(${Contribution.getLocator() | n,j});
     });
 </script>
diff --git a/indico/MaKaC/webinterface/tpls/MaterialDisplay.tpl b/indico/MaKaC/webinterface/tpls/MaterialDisplay.tpl
index 2e922edd1..764f751c5 100644
--- a/indico/MaKaC/webinterface/tpls/MaterialDisplay.tpl
+++ b/indico/MaKaC/webinterface/tpls/MaterialDisplay.tpl
@@ -10,7 +10,7 @@
 <h1 class="materialTitle">
     ${material.getTitle()}
     <div class="materialDescription">${material.getDescription()}</div>
-</h2>
+</h1>
 <div>
     <div class="materialMainContent">
         <div class="materialDetail">
@@ -56,7 +56,8 @@
 </div>
 
 <script type="text/javascript">
-    $("#manageMaterial").click(function(){
+    $("#manageMaterial").click(function(e){
+        e.preventDefault();
         IndicoUI.Dialogs.Material.editor('${material.getConference().getOwner().getId() if material.getConference() else ""}',
             '${material.getConference().getId() if material.getConference() else ""}', '${material.getSession().getId() if material.getSession() else ""}',
                 '${material.getContribution().getId() if material.getContribution() else ""}','${material.getSubContribution().getId() if material.getSubContribution() else ""}',
diff --git a/indico/MaKaC/webinterface/tpls/SessionDisplayFull.tpl b/indico/MaKaC/webinterface/tpls/SessionDisplayFull.tpl
index 7476ea7b5..fddb6b15b 100644
--- a/indico/MaKaC/webinterface/tpls/SessionDisplayFull.tpl
+++ b/indico/MaKaC/webinterface/tpls/SessionDisplayFull.tpl
@@ -159,7 +159,8 @@
         $('#timeTableDiv').hide();
     });
 
-    $("#manageMaterial").click(function(){
+    $("#manageMaterial").click(function(e){
+        e.preventDefault();
         openAttachmentManager(${session.getLocator() | n,j});
     });
     $('.sessionRightPanel').css('height', $('.sessionMainContent').css('height'));
diff --git a/indico/MaKaC/webinterface/tpls/SubContributionDisplayMin.tpl b/indico/MaKaC/webinterface/tpls/SubContributionDisplayMin.tpl
index a6baa59fa..57d65bed8 100644
--- a/indico/MaKaC/webinterface/tpls/SubContributionDisplayMin.tpl
+++ b/indico/MaKaC/webinterface/tpls/SubContributionDisplayMin.tpl
@@ -89,7 +89,8 @@
     </div>
 </div>
 <script type="text/javascript">
-    $("#manageMaterial").click(function(){
+    $("#manageMaterial").click(function(e){
+        e.preventDefault();
         openAttachmentManager(${SubContrib.getLocator() | n,j});
     });
 </script>
-- 
2.11.4.GIT