Merge pull request sakaiproject#2294 from alejandrogj/SAK-30624

SAK-30624 Tabbed layout for options/links missing
chundcm · Apr 22, 2016 · f6d06cf · f6d06cf
2 parents 5f4555a + cf2711a
commit f6d06cf
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 38 deletions.
diff --git a/mailsender/tool/src/java/org/sakaiproject/mailsender/tool/producers/NavBarRenderer.java b/mailsender/tool/src/java/org/sakaiproject/mailsender/tool/producers/NavBarRenderer.java
@@ -67,7 +67,6 @@ public void makeNavBar(UIContainer tofill, String divID, String currentViewID)
 		if (extLogic.isUserAllowedInLocation(extLogic.getCurrentUserId(), ExternalLogic.PERM_ADMIN,
 				extLogic.getCurrentLocationId()))
 		{
-			UIOutput.make(cell, "item-separator");
 
 			// options link
 			cell = UIBranchContainer.make(joint, "navigation-cell:", "2");
@@ -87,7 +86,6 @@ public void makeNavBar(UIContainer tofill, String divID, String currentViewID)
 			comp.decorate(new UIIDStrategyDecorator("navConfig"));
 
 			// permissions link
-			UIOutput.make(cell, "item-separator");
 
 			cell = UIBranchContainer.make(joint, "navigation-cell:", "3");
 			if (currentViewID.equals(PermissionsProducer.VIEW_ID))

diff --git a/mailsender/tool/src/webapp/component-templates/Navbar.html b/mailsender/tool/src/webapp/component-templates/Navbar.html
@@ -12,12 +12,13 @@
 
 <body>
 <!-- everything outside this div is thrown away -->
-<div rsf:id="navigation:" class="navIntraTool">
-	<div rsf:id="navigation-cell:" style="display:inline">
-		<a rsf:id="item-link" href="add_entry.htm" id="navConfig">Config Link</a>
-		<span rsf:id="item-text" id="configNavLink" class='navStatic'>Config Text</span>
-		<span rsf:id="item-separator" class='navSeparator'>|</span>
-	</div>
-</div>
+<ul rsf:id="navigation:" class="navIntraTool">
+	<li rsf:id="navigation-cell:" >
+		<span>
+			<a rsf:id="item-link" href="add_entry.htm" id="navConfig">Config Link</a>
+		</span>
+		<span rsf:id="item-text" id="configNavLink" class='current'>Config Text</span>
+	</li>
+</ul>
 </body>
 </html>
diff --git a/mailsender/tool/src/webapp/content/css/MailSender.css b/mailsender/tool/src/webapp/content/css/MailSender.css
@@ -42,6 +42,14 @@
 	float: left;
 }
 
+.optionsheadervalue label{
+	font-weight: normal;
+}
+
+.option-checkbox{
+	padding: .4em 0 0 0;
+}
+
 .optionsheaderkeyholder {
 	width: 20%;
 }

diff --git a/mailsender/tool/src/webapp/content/templates/options.html b/mailsender/tool/src/webapp/content/templates/options.html
@@ -9,49 +9,49 @@
 	<script type="text/javascript" language="JavaScript" src="/library/js/jquery-latest.min.js"></script>
 </head>
 <body>
-<div class="portletBody">
+<div class="portletBody container-fluid">
 
 	<div rsf:id="navIntraTool:" class="navIntraTool">Menu items will show here</div>
 
 	<div rsf:id="message-for:*">Messages for the user show here</div>
 
-	<form rsf:id="optionsForm" method="post">
+	<form rsf:id="optionsForm" method="post" class="form-horizontal">
 		<h3 rsf:id="msg=options_toolbar" class="insColor insBak insBorder">Options</h3>
 		<div rsf:id="msg=options_instruction" class="instruction section">
 			You are currently choosing options for Email. Settings chosen on this page will become the default settings for this site.
 		</div>
 
-		<div class="section">
-			<div class="optionsheaderkeyholder">
-				<span rsf:id="msg=options_copies" class="headerkey">Copies:</span>
+		<div class="section form-group">
+			<div class="optionsheaderkeyholder col-sm-4 ">
+				<span rsf:id="msg=options_copies" class="headerkey control-label">Copies:</span>
 			</div>
-			<div class="optionsheadervalue">
-				<div class="checkbox">
+			<div class="optionsheadervalue col-sm-8">
+				<div class="option-checkbox">
 					<input rsf:id="sendMeACopy" id="sendMeACopy" name="sendMeACopy" type="checkbox" />
 					<label rsf:id="msg=sendmeacopy" for="sendMeACopy">Send me a copy</label>
 				</div>
-				<div rsf:id="addToArchiveDiv" class="checkbox">
+				<div rsf:id="addToArchiveDiv" class="checkbox col-sm-8">
 					<input rsf:id="addToArchive" id="addToArchive" name="addToArchive" type="checkbox" />
 					<label rsf:id="msg=addtoemailarchive" for="addToArchive">Add to Email Archive, visible to all site participants</label>
 				</div>
 			</div>
 		</div>
-		<div class="section">
-			<div class="optionsheaderkeyholder">
-				<span rsf:id="msg=options_show_recipients" class="headerkey">Show Recipients:</span>
+		<div class="section form-group">
+			<div class="optionsheaderkeyholder col-sm-4">
+				<span rsf:id="msg=options_show_recipients" class="headerkey control-label">Show Recipients:</span>
 			</div>
-			<div class="optionsheadervalue">
-				<div class="checkbox">
+			<div class="optionsheadervalue col-sm-8">
+				<div class="option-checkbox">
 					<input rsf:id="appendRecipientList" id="appendRecipientList" name="appendRecipientList" type="checkbox" />
 					<label rsf:id="msg=appendrecipientlist" for="appendRecipientList">Append list of recipients to message</label>
 				</div>
 			</div>
 		</div>
-		<div class="section">
-			<div class="optionsheaderkeyholder">
-				<span rsf:id="msg=replyto" class="headerkey">Reply-to:</span>
+		<div class="section form-group">
+			<div class="optionsheaderkeyholder col-sm-4">
+				<span rsf:id="msg=replyto" class="headerkey control-label">Reply-to:</span>
 			</div>
-			<div class="optionsheadervalue">
+			<div class="optionsheadervalue col-sm-8">
 				<span rsf:id="replyToSelect" />
 				<div>
 					<input rsf:id="replyToSender" id="replyToSender" type="radio" />
@@ -62,11 +62,11 @@ <h3 rsf:id="msg=options_toolbar" class="insColor insBak insBorder">Options</h3>
 				</div>
 			</div>
 		</div>
-		<div class="section">
-			<div class="optionsheaderkeyholder">
-				<span rsf:id="msg=options_displayinvalidemails" class="headerkey optionsHeaderKey">Display invalid emails:</span>
+		<div class="section form-group">
+			<div class="optionsheaderkeyholder col-sm-4">
+				<span rsf:id="msg=options_displayinvalidemails" class="headerkey optionsHeaderKey control-label">Display invalid emails:</span>
 			</div>
-			<div class="optionsheadervalue">
+			<div class="optionsheadervalue col-sm-8">
 				<span rsf:id="invalidEmailsSelect" />
 				<div>
 					<input rsf:id="invalidEmailsYes" id="invalidEmailsYes" type="radio" />
@@ -77,11 +77,11 @@ <h3 rsf:id="msg=options_toolbar" class="insColor insBak insBorder">Options</h3>
 				</div>
 			</div>
 		</div>
-		<div class="section">
-			<div class="optionsheaderkeyholder">
-				<span rsf:id="msg=options_displayemptygroups" class="headerkey optionsHeaderKey">Display empty recipient groups:</span>
+		<div class="section form-group">
+			<div class="optionsheaderkeyholder col-sm-4">
+				<span rsf:id="msg=options_displayemptygroups" class="headerkey optionsHeaderKey control-label">Display empty recipient groups:</span>
 			</div>
-			<div class="optionsheadervalue">
+			<div class="optionsheadervalue col-sm-8">
 				<span rsf:id="emptyGroupsSelect" />
 				<div>
 					<input rsf:id="emptyGroupsYes" id="emptyGroupsYes" type="radio" />
@@ -92,11 +92,11 @@ <h3 rsf:id="msg=options_toolbar" class="insColor insBak insBorder">Options</h3>
 				</div>
 			</div>
 		</div>
-		<div rsf:id="subjectPrefixDiv" class="section">
-			<div class="optionsheaderkeyholder">
-				<span rsf:id="msg=options_subjectprefix" class="headerkey">Subject Prefix:</span>
+		<div rsf:id="subjectPrefixDiv" class="section form-group" >
+			<div class="optionsheaderkeyholder col-sm-4">
+				<span rsf:id="msg=options_subjectprefix" class="headerkey control-label">Subject Prefix:</span>
 			</div>
-			<div class="optionsheadervalue">
+			<div class="optionsheadervalue col-sm-8">
 				<span rsf:id="subjectPrefixSelect" />
 				<div>
 					<input rsf:id="subjectPrefixDefault" id="subjectPrefixDefault" type="radio" onclick="jQuery('#customPrefixDiv').hide()" />