SAK-42102 Create consistent page headers for Announcements, Calendar,…

… Forums, Dropbox, Email, and Email Archive (sakaiproject#7116)
bot2012 · Aug 6, 2019 · f2f296d · f2f296d
1 parent 66a65a1
commit f2f296d
Show file tree

Hide file tree

Showing 36 changed files with 159 additions and 118 deletions.
diff --git a/...ncement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements-customize.vm b/...ncement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements-customize.vm
@@ -19,7 +19,9 @@
 		#end
 	#end
 
-	<div class="page-header"><h3>$tlang.getString("custom.options")</h3></div>
+	<div class="page-header">
+		<h1>$tlang.getString("custom.options")</h1>
+	</div>
 
 	#if ($alertMessage)<div class="sak-banner-error">$tlang.getFormattedMessage("gen.alert.message", $alertMessage)</div>#end
 	<p class="instruction indnt2">

diff --git a/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements-merge.vm b/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements-merge.vm
@@ -14,7 +14,9 @@
 		#end
 	#end
 
-	<div class="page-header"><h3>$tlang.getString("merge.show")</h3></div>
+	<div class="page-header">
+		<h1>$tlang.getString("merge.show")</h1>
+	</div>
 
 	<form name="Options" action="#toolForm("$action")" method="post">
 		#if ($alertMessage)<div class="sak-banner-error">$tlang.getFormattedMessage("gen.alert.message", $alertMessage)</div>#end

diff --git a/...uncement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements-metadata.vm b/...uncement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements-metadata.vm
@@ -15,7 +15,7 @@
 	#if ($alertMessage)<div class="sak-banner-error">$tlang.getFormattedMessage("gen.alert.message", $alertMessage)</div>#end
 
 	<div class="page-header">
-	  <h2>$validator.escapeHtml($message.Header.subject)</h2>
+	  <h1>$validator.escapeHtml($message.Header.subject)</h1>
 	</div>
 
 	<div class="form-horizontal">
@@ -75,9 +75,7 @@
 	</div>
 
 	<div class="page-header">
-		<h4>
-			$tlang.getString("meta.message")
-		</h4>
+		<h1>$tlang.getString("meta.message")</h1>
 	</div>
 
 	<div class="message-body">

diff --git a/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements-reorder.vm b/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements-reorder.vm
@@ -11,7 +11,9 @@
 			#set ($SiteColumnFlag = $SiteColumnFlag + 1)
 		#end
 	#end
-	<div class="page-header"><h3>$tlang.getString("reorder.title")</h3></div>
+	<div class="page-header">
+		<h1>$tlang.getString("reorder.title")</h1>
+	</div>
 
 	#if ($alertMessage)<div class="sak-banner-error">$tlang.getFormattedMessage("gen.alert.message", $alertMessage)</div>#end
 	<div class="navPanel">

diff --git a/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements-revise.vm b/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements-revise.vm
@@ -70,13 +70,13 @@ function resizeFrame(){
 	#end
 
 	<div class="page-header">
-		<h3>
+		<h1>
 		#if ( $newAnn =="true")
 			$tlang.getString("revise.add")
 		#else
 			$tlang.getString("revise.revise")
 		#end
-		</h3>
+		</h1>
 	</div>
 
 	#if ($alertMessage)<div class="sak-banner-error">$tlang.getFormattedMessage("gen.alert.message", $alertMessage)</div>#end

diff --git a/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements.vm b/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements.vm
@@ -74,7 +74,7 @@
 	#if ($isOnWorkspaceTab.equals("true")) ##in workspace
 
 		<div class="page-header">
-		  <h3>$tlang.getString("gen.announcements") <br /><small>$tlang.getFormattedMessage("gen.viewing.days.phrase.brackets", $daysList.toArray())</small></h3>
+			<h1>$tlang.getString("gen.announcements") <br /><small>$tlang.getFormattedMessage("gen.viewing.days.phrase.brackets", $daysList.toArray())</small></h1>
 		</div>
 
 		#if ($alertMessage)<div class="sak-banner-error">$tlang.getFormattedMessage("gen.alert.message", $alertMessage)</div>#end
@@ -356,7 +356,7 @@
 			#if ($alertMessage)<div class="sak-banner-error">$tlang.getFormattedMessage("gen.alert.message", $alertMessage)</div>#end
 
 			<div class="page-header">
-			  <h3>$tlang.getString("gen.announcements") <br /><small>$tlang.getFormattedMessage("gen.viewing.days.phrase.brackets", $daysList.toArray())</small></h3>
+				<h1>$tlang.getString("gen.announcements") <br /><small>$tlang.getFormattedMessage("gen.viewing.days.phrase.brackets", $daysList.toArray())</small></h1>
 			</div>
 
 			<form name="announcementListForm" action="#toolForm("AnnouncementAction")" method="post">
@@ -420,7 +420,7 @@
 
 				#if ($displayOptions.isShowAllColumns())
 					<div class="page-header">
-					  <h3>$tlang.getString("gen.announcements") <br /><small>$tlang.getFormattedMessage("gen.viewing.days.phrase.brackets", $daysList.toArray())</small></h3>
+						<h1>$tlang.getString("gen.announcements") <br /><small>$tlang.getFormattedMessage("gen.viewing.days.phrase.brackets", $daysList.toArray())</small></h1>
 					</div>
 
 					#if ($alertMessage)<div class="sak-banner-error">$tlang.getFormattedMessage("gen.alert.message", $alertMessage)</div>#end

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar-customize_fields.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar-customize_fields.vm
@@ -12,9 +12,9 @@
 </script>
 <div class="portletBody">
 	#if($menu)#toolbar($menu)#end
-	<h3>
-		$tlang.getString('cust.addrev')
-	</h3>
+	<div class="page-header">
+		<h1>$tlang.getString('cust.addrev')</h1>
+	</div>
 	<script type="text/javascript"> var a = document.MyCalendar; </script>
 	#if ($alertMessage)
 		<div class="sak-banner-error">$tlang.getString('gen.alert') $validator.escapeHtml($alertMessage)</div>

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar-merge.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar-merge.vm
@@ -1,8 +1,8 @@
 <div class="portletBody"> 
 	#if($menu)#toolbar($menu)#end
-	<h3>
-		$tlang.getString('merge.merge')
-	</h3>
+	<div class="page-header">
+		<h1>$tlang.getString('merge.merge')</h1>
+	</div>
 	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString('gen.alert') $validator.escapeHtml($alertMessage)</div>#end
 	<p class="instruction">
 		$tlang.getString('merge.select')

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar-opaqueUrlClean.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar-opaqueUrlClean.vm
@@ -1,9 +1,9 @@
 ## $Header: /cvs/sakai2/legacy/tools/src/webapp/vm/calendar/chef_calendar-opaqueUrl1.vm,v 1.5 2005/05/28 03:04:35 ggolden.umich.edu Exp $
 <div class="portletBody"> 
 	#if($menu)#toolbar($menu)#end
-	<h3>
-		$tlang.getString('ical_opaqueurl_header')
-	</h3>
+	<div class="page-header">
+		<h1>$tlang.getString('ical_opaqueurl_header')</h1>
+	</div>
 	<p class="instruction">
 		$tlang.getString('ical_opaqueurl_explanation')
 	</p>

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar-subscriptions.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar-subscriptions.vm
@@ -2,9 +2,9 @@
 
 <div class="portletBody">
 	#if($menu)#toolbar($menu)#end
-	<h3>
-		$tlang.getString('subs.subscriptions')
-	</h3>
+	<div class="page-header">
+		<h1>$tlang.getString('subs.subscriptions')</h1>
+	</div>
 	<script type="text/javascript"> var a = document.MyCalendar; </script>
 	#if ($alertMessage)
 		<div class="sak-banner-error">$tlang.getString('gen.alert') $validator.escapeHtml($alertMessage)</div>

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_icalexport.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_icalexport.vm
@@ -20,10 +20,10 @@
 	#if($menu)#toolbar($menu)#end
 
 	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
-	
-	<h3>
-		$tlang.getString("ical.title")
-	</h3>
+
+	<div class="page-header">
+		<h1>$tlang.getString("ical.title")</h1>
+	</div>
 
 	<p class="sak-banner-info">
 		$icalInfoStr $tlang.getString("ical.info.public")<br/>

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_import_wizard.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_import_wizard.vm
@@ -5,9 +5,9 @@
 </script>
 <div class="portletBody"> 
 	#if($menu)#toolbar($menu)#end
-	<h3>
-		$tlang.getString("java.importcal")
-	</h3>
+	<div class="page-header">
+		<h1>$tlang.getString("java.importcal")</h1>
+	</div>
 	<p class="step">
 		#if ($importWizardState == "SELECT_TYPE")
 		$tlang.getString("imp.step1")

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_new.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_new.vm
@@ -38,7 +38,7 @@ function hourChange(FieldName)
         case 'startHour':
         case 'startMinute':
         {
-       
+
             startHour = parseInt(document.getElementById('startHour').value);
             if (startHour != 100)
                 minuteChange(FieldName);
@@ -73,8 +73,8 @@ function minuteChange(FieldName)
         {
         case 'startMinute':
         case 'duMinute':
-        case 'startHour': 
-        case 'duHour': 
+        case 'startHour':
+        case 'duHour':
         {
         startHour = parseInt(document.getElementById('startHour').value);
         if (startHour != 100)
@@ -120,7 +120,7 @@ function minuteChange(FieldName)
                 var em = sm + dm;
                 var halfdaym = 12 * 60;
                 var wholedaym = 24 * 60;
-                if ((em < halfdaym) || (em >= wholedaym)) 
+                if ((em < halfdaym) || (em >= wholedaym))
                 {
                     <!-- endHour still falls in the same half day -->
                     startAmpmIndex = document.getElementById('startAmpm').selectedIndex;
@@ -170,8 +170,8 @@ function minuteChange(FieldName)
 				{
 					endHour = 0;
 				}
-               if (startHour==12) 
-               {   
+               if (startHour==12)
+               {
                    startHour = 0;
                }
                 startAmpmIndex = document.getElementById('startAmpm').selectedIndex;
@@ -183,10 +183,10 @@ function minuteChange(FieldName)
 
                 if (em == sm)
                 { <!-- set duTime to be zero -->
-                    duHour = 0; 
+                    duHour = 0;
                     duMinute =0;
                 }
-                else if (em < sm) 
+                else if (em < sm)
                 { <!-- end time is earlier than start time -->
                     dm = em - sm + 24 * 60;
                     duMinute = dm % 60;
@@ -198,7 +198,7 @@ function minuteChange(FieldName)
                     duMinute = dm % 60;
                     duHour = Math.floor(dm / 60);
                 }
-                document.getElementById('duHour').selectedIndex = duHour; 
+                document.getElementById('duHour').selectedIndex = duHour;
                 document.getElementById('duMinute').selectedIndex = duMinute/5;
             }
         } break;
@@ -220,16 +220,16 @@ function ampmChange(FieldName)
     {
         case 'startAmpm':
         {
-            
+
             startHour = parseInt(document.getElementById('startHour').value);
             if (startHour != 100)
             {
                 startAmpm = document.getElementById('startAmpm').value;
                 endAmpmIndex = document.getElementById('endAmpm').selectedIndex;
-                document.getElementById('endAmpm').selectedIndex = Math.abs(endAmpmIndex - 1);           
+                document.getElementById('endAmpm').selectedIndex = Math.abs(endAmpmIndex - 1);
             }
         } break;
-        case 'endAmpm': 
+        case 'endAmpm':
         {
             minuteChange(FieldName);
         } break;
@@ -324,9 +324,9 @@ $(function() {
 
 <div class="portletBody">
 	#if($menu)#toolbar($menu)#end
-	<h3>
-		$tlang.getString("new.adding")
-	</h3>
+	<div class="page-header">
+		<h1>$tlang.getString("new.adding")</h1>
+	</div>
 	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 	<p class="instruction">
 		$tlang.getString("new.toadd")<br />
@@ -549,7 +549,7 @@ $(function() {
 				#if($dmi == 55) <option selected="selected" value="55">55</option> #else <option value="55">55</option> #end
 			</select>
 			$tlang.getString("new.minutes")
-            
+
 		</p>	
 		<p class="shorttext">
 			<label>

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewDay.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewDay.vm
@@ -5,7 +5,9 @@
 
 		#if ($alertMessage)<div class="sak-banner-error">$tlang.getString('gen.alert') $validator.escapeHtml($alertMessage)</div>#end
 
-	<h3>$tlang.getString("view.calday")</h3>
+		<div class="page-header">
+			<h1>$tlang.getString("view.calday")</h1>
+		</div>
 		<div class="alertPanel">
 			<div class="viewNav">
 				<form name="viewForm" class="inlineForm" method="post" action="#toolForm("CalendarAction")">

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewMonth.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewMonth.vm
@@ -5,7 +5,9 @@
 <!-- First table -->
 	<div class="clear"></div>
 
-<h3>$tlang.getString("view.calmonth")</h3>
+<div class="page-header">
+	<h1>$tlang.getString("view.calmonth")</h1>
+</div>
 
 <!-- drop down menu for different views -->
 	<div class="navPanel">

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewWeek.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewWeek.vm
@@ -2,8 +2,10 @@
 <div class="portletBody">
 	#if($menu)#toolbar($menu)#end
 	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString('gen.alert') $validator.escapeHtml($alertMessage)</div>#end
-	<h3>$tlang.getString("view.calweek")</h3>
-
+	<div class="page-header">
+		<h1>$tlang.getString("view.calweek")</h1>
+	</div>
+
 <!-- drop down menu for different views -->
 	<div class="navPanel">
 		<div class="viewNav">

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewYear.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewYear.vm
@@ -4,7 +4,9 @@
 
 		#if ($alertMessage)<div class="sak-banner-error">$tlang.getString('gen.alert') $validator.escapeHtml($alertMessage)</div>#end
 
-<h3>$tlang.getString("view.calyear")</h3>
+<div class="page-header">
+	<h1>$tlang.getString("view.calyear")</h1>
+</div>
 	<div class="navPanel">
 		<div class="viewNav">
 		<!-- drop down menu for different views -->

diff --git a/content/content-tool/tool/src/webapp/vm/content/chef_resources_webdav.vm b/content/content-tool/tool/src/webapp/vm/content/chef_resources_webdav.vm
@@ -74,7 +74,9 @@
 	</ul>
 	#if($menu)#toolbar($menu)#end
 	<div id="davdocs_intro">
-		<h3>$tlang.getString("dav.webdav")</h3>
+		<div class="page-header">
+			<h1>$tlang.getString("dav.webdav")</h1>
+		</div>
 		<p>$tlang.getString("dav.graf1").</p>
 		<p>$tlang.getString("dav.graf2") <strong>$tlang.getString("dav.graf3")</strong>. $tlang.getString("dav.graf4").</p>
 		<p>$tlang.getString("dav.graf5") <strong>$tlang.getString("dav.graf6")</strong> $tlang.getString("dav.graf7") <strong>$tlang.getString("dav.graf8")</strong> $tlang.getString("dav.graf9").</p>

diff --git a/content/content-tool/tool/src/webapp/vm/content/sakai_dropbox_options.vm b/content/content-tool/tool/src/webapp/vm/content/sakai_dropbox_options.vm
@@ -21,9 +21,10 @@
 		<input type="hidden" name="sakai_action" id="sakai_action" value="doUpdateDropboxOptions" />
 		<input type="hidden" name="siteId" id="siteId" value="$siteId" />
 		######################## ================ Title Bar for Item ================ ########################
-		<h4>
-			$title
-		</h4>
+		<div class="page-header">
+			<h1>$title</h1>
+		</div>
+
 		#if ($itemAlertMessage)
 			<div class="sak-banner-error">$tlang.getString("label.alert") $validator.escapeHtml($itemAlertMessage)</div>
 		#end

diff --git a/content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm b/content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm
@@ -99,6 +99,9 @@
 			#end
 		</ul>
 		</ul>
+	<div class="page-header">
+		<h1>$tlang.getString("list.site.dropbox")</h1>
+	</div>
 	#if ($alertMessage)
 		<br /><div class="sak-banner-warn">$alertMessage</div>
 	#end

diff --git a/content/content-tool/tool/src/webapp/vm/content/sakai_resources_restore.vm b/content/content-tool/tool/src/webapp/vm/content/sakai_resources_restore.vm
@@ -5,7 +5,8 @@
 		<input name="sakai_action" id="sakai_action" value="doRestore" type="hidden" />
 		<input name="flow" id="flow" value="save" type="hidden" />
 		#set($rootFolderId="")
-			<h3>
+		<div class="page-header">
+			<h1>
 				$tlang.getString("restore.title")
 				$rootFolderId
                 #*
@@ -14,7 +15,8 @@
 					$validator.escapeHtml("$item.name")
 				#end
                 *#
-			</h3>
+			</h1>
+		</div>
 			## set the base collection ID
 			#set($currentFolderId=$rootFolderId)
 

diff --git a/content/content-tool/tool/src/webapp/vm/resources/sakai_dropbox_multiple_folders_upload.vm b/content/content-tool/tool/src/webapp/vm/resources/sakai_dropbox_multiple_folders_upload.vm
@@ -2,9 +2,9 @@
 <script type="text/javascript">includeLatestJQuery('content_dropbox_multiple');</script>
 
 <div class="portletBody specialLink">
-	<h3>
-		$tlang.getString("multiple.file.upload")
-	</h3>
+	<div class="page-header">
+		<h1>$tlang.getString("multiple.file.upload")</h1>
+	</div>
 	#if ($alertMessage)
 		<br /><div class="sak-banner-error">$clang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>
 	#end