Skip to content

Commit

Permalink
SAK-42101 Consistent Headings in Portal, Roster2, Samigo, Signup, and…
Browse files Browse the repository at this point in the history
… Site-Manage (sakaiproject#7111)

* SAK-42101 Changed headings to be in h1 tags in portal, roster2, samigo, signup, and site-manage

* SAK-42101 JSF: changed the the view title renderer to enclose the value of sakai:view_title in h1 tags instead of h3 tags & Signup: enclosed the sakai:view_title tags with div class= page-header
  • Loading branch information
michelle-tai authored and fostersdesign committed Jul 31, 2019
1 parent f955722 commit a0cee45
Show file tree
Hide file tree
Showing 39 changed files with 159 additions and 55 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
if (!component.isRendered()) return;

ResponseWriter writer = context.getResponseWriter();
writer.startElement("h3", null);
writer.startElement("h1", null);

// TODO: Should we really write out the ID? Is there any need for this in this tag?
// String id = (String) RendererUtil.getAttribute(context, component, "id");
Expand Down Expand Up @@ -76,7 +76,7 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOExce
if (!component.isRendered()) return;

ResponseWriter writer = context.getResponseWriter();
writer.endElement("h3");
writer.endElement("h1");
}
}

Expand Down
4 changes: 4 additions & 0 deletions roster2/tool/src/handlebars/overview.handlebars
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<!-- top toolbar -->
<div class="sakai-table-toolBar">
<!-- header for overview part -->
<div class="page-header">
<h1>{{translate 'navbar_overview'}}</h1>
</div>
<div class="sakai-table-filterContainer">
<div class="sakai-table-viewFilter">
<label for="roster-roles-selector">{{translate 'roles_label'}}</label>
Expand Down
6 changes: 5 additions & 1 deletion roster2/tool/src/handlebars/permissions.handlebars
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
<h3>{{translate 'title_permissions'}}: {{siteTitle}}</h3>
<div class="page-header">
<h1>
{{translate 'title_permissions'}}: {{siteTitle}}
</h1>
</div>
<sakai-tool-permissions tool="roster" />
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@
<script type="text/JavaScript">includeWebjarLibrary('datatables');</script>
<script type="text/javascript" src="/samigo-app/js/info.js"></script>

<%-- header--%>
<div class="page-header">
<h1>
<h:outputText value="#{questionPoolMessages.add} #{authorFrontDoorMessages.assessments}" />
</h1>
</div>

<div class="samigo-container">
<p>
<h:messages styleClass="messageSamigo" rendered="#{! empty facesContext.maximumSeverity}" layout="table"/>
Expand Down
8 changes: 5 additions & 3 deletions samigo/samigo-app/src/webapp/jsf/questionpool/poolList.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,11 @@
</li>
</ul>

<h1>
<h:outputText value="#{generalMessages.questionPool}"/>
</h1>
<div class="page-header">
<h1>
<h:outputText value="#{generalMessages.questionPool}"/>
</h1>
</div>

<h:outputText rendered="#{questionpool.importToAuthoring == 'true'}" value="#{questionPoolMessages.msg_imp_poolmanager}"/>

Expand Down
9 changes: 5 additions & 4 deletions samigo/samigo-app/src/webapp/jsf/template/templateIndex.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@
<!-- HEADINGS -->
<%@ include file="/jsf/template/templateHeadings.jsp" %>
<h:messages styleClass="messageSamigo" rendered="#{! empty facesContext.maximumSeverity}" layout="table"/>

<h3>
<h:outputText value="#{templateMessages.index_templates}"/>
</h3>
<div class="page-header">
<h1>
<h:outputText value="#{templateMessages.index_templates}"/>
</h1>
</div>

<div class="tier1">
<h:outputText value="#{templateMessages.index_desc}" rendered="#{authorization.createTemplate}"/>
Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/attendee/addSignupAttendee.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
<sakai:view_content>
<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>
<h:form id="meeting">
<sakai:view_title value="#{msgs.event_addSignup_attendee_page_title}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.event_addSignup_attendee_page_title}"/>
</div>

<h:panelGrid columns="2" columnClasses="titleColumn,valueColumn" style="margin-top:20px;">
<h:outputText value="#{msgs.event_name}" styleClass="titleText" escape="false"/>
Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/attendee/editComment.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
<sakai:view_content>
<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>
<h:form id="meeting">
<sakai:view_title value="#{msgs.event_edit_comment_page_title}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.event_edit_comment_page_title}"/>
</div>
<div class="table-responsive">
<h:panelGrid columns="2" columnClasses="titleColumn,valueColumn" style="margin-top:20px;">
<h:outputText value="#{msgs.event_name}" styleClass="titleText" escape="false"/>
Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/attendee/signupMeeting.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@
rendered="#{messageUIBean.error}" />

<h:form id="meeting">
<sakai:view_title value="#{msgs.event_participant_view_page_title}" />
<div class="page-header">
<sakai:view_title value="#{msgs.event_participant_view_page_title}" />
</div>

<%-- show title only when collapsed --%>
<h:panelGrid id="showMeetingTitleOnly" columns="2" columnClasses="titleColumn,valueColumn" styleClass="orgShowTitleOnly">
Expand Down
8 changes: 5 additions & 3 deletions signup/tool/src/webapp/signup/download/downloadSelections.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,12 @@
<sakai:view_content>
<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>
<h:form id="items">
<sakai:view_title value="#{msgs.signup_download}"/>

<div class="page-header">
<sakai:view_title value="#{msgs.signup_download}"/>
</div>

<h:outputText value="&nbsp;" escape="false"/>

<h:panelGrid columns="1">
<h:outputText value="#{msgs.events_organizer_download_instruction}" rendered="#{DownloadEventBean.allowedToUpdate && DownloadEventBean.meetingsAvailable}" escape="false"/>
<h:outputText value="#{msgs.events_attendee_download_instruction}" rendered="#{!DownloadEventBean.allowedToUpdate && DownloadEventBean.meetingsAvailable}" escape="false"/>
Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/newMeeting/assignStudents.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@

<sakai:view_content>
<h:form id="meeting">
<sakai:view_title value="#{msgs.event_assign_attendee_page_title}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.event_assign_attendee_page_title}"/>
</div>

<h:panelGrid columns="2" style="margin-top:20px;margin-bottom:20px;" columnClasses="titleColumn,valueColumn">
<h:outputText value="#{msgs.event_date}" styleClass="titleText" escape="false"/>
Expand Down
9 changes: 7 additions & 2 deletions signup/tool/src/webapp/signup/newMeeting/step1.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,16 @@
<sakai:view_content>
<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>
<h:form id="meeting" >
<sakai:view_title value="#{msgs.create_new_event} #{msgs.basic}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.create_new_event} #{msgs.basic}"/>
</div>
<sakai:doc_section>
<h:panelGrid columns="1" styleClass="instruction" style="background:#fff;">
<h:outputText value="#{msgs.create_instruction} " escape="false" />
<h:panelGroup>
<h:panelGroup> site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-editToolGroupFeatures.vm



<h:outputText value="#{msgs.star_character}" style="color:#B11;" />
<h:outputText value="&nbsp;#{msgs.required2}" escape="false" />
</h:panelGroup>
Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/newMeeting/step2.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@
<h:outputText value="#{messageUIBean.infoMessage}" styleClass="information" escape="false" rendered="#{messageUIBean.info}"/>

<h:form id="meeting">
<sakai:view_title value="#{msgs.event_step5_page_title}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.event_step5_page_title}"/>
</div>
<div class="form">
<%-- title --%>
<div class="row">
Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/organizer/cancelTimeslot.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
<sakai:view_content>
<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>
<h:form id="meeting">
<sakai:view_title value="#{msgs.cancel_timeslot}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.cancel_timeslot}"/>
</div>
<sakai:doc_section>
<h:outputText value="#{msgs.confirm_cancel}"/>
</sakai:doc_section>
Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/organizer/copyMeeting.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@
<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>
<h:outputText id="iframeId" value="#{CopyMeetingSignupMBean.iframeId}" style="display:none"/>
<h:form id="meeting">
<sakai:view_title value="#{msgs.event_copy_meeting_page_title}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.event_copy_meeting_page_title}"/>
</div>
<sakai:doc_section>
<h:panelGrid columns="1" styleClass="instruction">
<h:panelGroup>
Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/organizer/modifyMeeting.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@
<sakai:view_content>
<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>
<h:form id="meeting">
<sakai:view_title value="#{msgs.event_modify_meeting_page_title}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.event_modify_meeting_page_title}"/>
</div>
<sakai:doc_section>
<h:panelGrid columns="1" styleClass="instruction">
<h:panelGroup>
Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/organizer/orgSignupMeeting.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,9 @@
<h:inputHidden id="userActionType" value="#{OrganizerSignupMBean.userActionType}"/>
<h:inputHidden id="selectedFirstUser" value="#{OrganizerSignupMBean.selectedFirstUser}"/>

<sakai:view_title value="#{msgs.organizer_page_title}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.organizer_page_title}"/>
</div>
<%-- show title only when collapsed --%>
<div id="showMeetingTitleOnly" styleClass="orgShowTitleOnly">
<div class="row">
Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/organizer/userDefTsBlocks.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@
<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>

<h:form id="meeting">
<sakai:view_title value="#{msgs.event_view_userDefined_Timeslot_page_title}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.event_view_userDefined_Timeslot_page_title}"/>
</div>

<h:outputText value="#{msgs.warn_reschedule_event}" styleClass="alertMessage" style="width:85%" escape="false" rendered="#{UserDefineTimeslotBean.someoneSignedUp}"/>

Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/organizer/viewComment.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>

<h:form id="meeting">
<sakai:view_title value="#{msgs.event_view_comment_page_title}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.event_view_comment_page_title}"/>
</div>
<div class="table-responsive">
<h:panelGrid columns="2" columnClasses="titleColumn,valueColumn">

Expand Down
5 changes: 3 additions & 2 deletions signup/tool/src/webapp/signup/signupMeetings.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,9 @@
<sakai:view_content>
<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>
<h:form id="items">
<sakai:view_title value="#{msgs.signup_tool}"/>

<div class="page-header">
<sakai:view_title value="#{msgs.signup_tool}"/>
</div>
<h:panelGroup styleClass="" rendered="#{(SignupMeetingsBean.allowedToUpdate && SignupMeetingsBean.meetingsAvailable) or (!SignupMeetingsBean.allowedToUpdate && SignupMeetingsBean.meetingsAvailable)}">
<h:outputText value="#{msgs.events_organizer_instruction}" rendered="#{SignupMeetingsBean.allowedToUpdate && SignupMeetingsBean.meetingsAvailable}" escape="false"/>
<h:outputText value="&nbsp;" escape="false"/>
Expand Down
4 changes: 3 additions & 1 deletion signup/tool/src/webapp/signup/updatePermission.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
<sakai:view_content>
<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>
<h:form id="meeting">
<sakai:view_title value="#{msgs.permission_page_title}"/>
<div class="page-header">
<sakai:view_title value="#{msgs.permission_page_title}"/>
</div>
<sakai:doc_section>
<h:panelGrid columns="1" styleClass="instruction" style="background:#fff;">
<h:outputText value="#{msgs.permission_note_for_view_attend_group}" escape="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
<div id="page-order-body" class="portletBody">
<a href="#" rsf:id="redirect">go back</a>
<div rsf:id="content:">
<h3 rsf:id="msg=page_title">page_title</h3>
<div class="page-header">
<h1 rsf:id="msg=page_title">page_title</h1>
</div>
<div class="alertMessageContainer">
<div class="alert alert-info" id="call-results" role="alert">
<span rsf:id="msg=welcome">Note: Changes to page ordering will not take effect until you click 'Save'. Deleting, Adding or Editing a Page is saved immediately</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
<body>
<div class="portletBody">
<form rsf:id="groups-form">
<h3 rsf:id="prompt"></h3>
<div class="page-header">
<h1 rsf:id="prompt"></h1>
</div>
<p rsf:id="instructions" class="instruction"></p>
<div rsf:id="error-row:">
<div class="alertMessage" rsf:id="error">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
</div>
</div>
<form rsf:id="groups-form">
<h3 rsf:id="prompt"></h3>
<div class="page-header">
<h1 rsf:id="prompt"></h1>
</div>
<p rsf:id="msg=group.autocreate.instructions" class="instruction">Select a course roster to create a separate group for that roster.</p>
<div rsf:id="roster_options:">
<h4 rsf:id="msg=instruction.header.roster">From Rosters</h4>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@
</div>

<form rsf:id="groups-form" id="groups-form">
<h3 rsf:id="prompt"></h3>
<div class="page-header">
<h1 rsf:id="prompt"></h1>
</div>
<p id="" class="messageValidation" rsf:id="emptyGroupTitleAlert" style="display:none"/>
<p rsf:id="instructions" class="instruction">
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
<div class="alertMessage" rsf:id="error">import1.error.title</div>
</div>
<div rsf:id="content:">
<h3 rsf:id="msg=import1.title">import1.title</h3>
<div class="page-header">
<h1 rsf:id="msg=import1.title">import1.title</h1>
</div>
<b><p rsf:id="msg=import1.instr.req.header">import1.instr.req.header</p></b>
<ul>
<li rsf:id="import1.instr.req.1">import1.instr.req.1</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
<li><span><a href="#" rsf:id="auto_add" class="item_control" title="Automatically Create New Group" onclick="">Auto Groups</a></span></li>
<li><span><a href="#" rsf:id="import_add" class="item_control" title="Automatically Create New Group" onclick="">Auto Groups</a></span></li>
</ul>

<h3 rsf:id="group-list-title">Groups</h3>
<div class="page-header">
<h1 rsf:id="group-list-title">Groups</h1>
</div>
<!-- alert message -->
<div rsf:id="error-row:">
<div class="alertMessage" rsf:id="error">We Have Errors!</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#javascript("/library/js/spinner.js")
<div class="portletBody">
<h3>$tlang.getString('title')</h3>
<div class="page-header">
<h1>$tlang.getString('title')</h1>
</div>
#if ($alertMessage)
<div class="alertMessage">$tlang.getString("gen.alert") $alertMessage</div><div style="display:block;clear:both" ></div>
#end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
<div id="participant-body" class="portletBody">
<div rsf:id="content:">
<!-- instruction for adding participant to course sites -->
<h2 rsf:id="msg=java.addp">Add Participant</h2>
<div class="page-header">
<h1 rsf:id="msg=java.addp">Add Participant</h1>
</div>
<p>
<span rsf:id="add.official" class="highlight"></span>
<span rsf:id = "add.official1"></span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

<div class="portletBody">
#if($menu)#toolbar($menu)#end
## header for manage tools page
<div class="page-header">
<h1>$tlang.getString("java.edittools")</h1>
</div>

<div class="siteInfoContent">
#if (!$!existSite)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
##<!-- $Header: /cvs/sakai2/legacy/tools/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm,v 1.3 2005/05/25 17:42:01 gsilver.umich.edu Exp $ -->
<div class="portletBody container-fluid">
#if($menu)#toolbar($menu)#end
#if (!$!site)
<h3>$tlang.getString("nscourse.creating")</h3>
<p class="step">
$tlang.getString("nscourse.course_sections_selection") - $term.title
</p>
#else
<h3>$tlang.getString("nscourse.edit") <span class="highlight">$!siteTitle</span></h3>
#end
## header for edit class roster's editing course/section info
<div class="page-header">
#if (!$!site)
<h1>$tlang.getString("nscourse.creating")</h1>
<p class="step">
$tlang.getString("nscourse.course_sections_selection") - $term.title
</p>
#else
<h1>$tlang.getString("nscourse.edit") <span class="highlight">$!siteTitle</span></h1>
#end
</div>
#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $alertMessage</div>#end
<p class="instruction">
#if (!$!site)
Expand Down
Loading

0 comments on commit a0cee45

Please sign in to comment.