Merge pull request #1880 from erikdesjardins/qm-settings

gear linking to quickMessage settings
honestbleeps · Dec 19, 2014 · 684f9ca · 684f9ca
2 parents bb569f9 + 6adfda5
commit 684f9ca
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/core/templates.html b/lib/core/templates.html
@@ -185,8 +185,9 @@ <h3>The Fine Print</h3>
 		<!-- Quick Message Dialog -->
 		<style type="text/css" id="quickMessageCSS">
 			#quickMessage { display: none; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background-color: rgba(0, 0, 0, 0.74902); z-index: 2000; }
-			#quickMessageDialog { position: fixed; top: 20%; left: 25%; width: 50%; z-index: 100001 }
-			#quickMessageDialog label { margin-top: 5px; clear: both; float: left; }
+			#quickMessageDialog { position: fixed; top: 20%; left: 25%; width: 50%; z-index: 100001; }
+			#quickMessageDialog .gearIcon { float: right; margin-right: 40px; }
+			#quickMessageDialog label { margin-top: 9px; clear: both; float: left; }
 			#quickMessageDialog input[type=text], #quickMessageDialog textarea { margin-top: 5px; width: calc(100% - 70px); float: right; border: 1px solid #c7c7c7; border-radius: 3px; margin-bottom: 6px; padding: 3px; }
 			#quickMessageDialog select { margin-top: 5px; width: calc(100% - 63px); float: right; border: 1px solid #c7c7c7; border-radius: 3px; margin-bottom: 6px; padding: 3px; }
 			#quickMessageDialog textarea { resize: vertical; min-height: 100px; }
@@ -195,7 +196,8 @@ <h3>The Fine Print</h3>
 		</style>
 		<div id="quickMessage">
 			<div id="quickMessageDialog" class="RESDialogSmall">
-				<h3>Send Message</h3>
+				<h3>Send Message<a class="gearIcon" href="#!settings/quickMessage"></a></h3>
+				<div id="quickMessageDialogClose" class="RESCloseButton">×</div>
 				<div id="quickMessageDialogContents" class="RESDialogContents clear">
 					<form name="quickMessageDialogForm" action="">
 						<label for="quickMessageDialogFrom">From</label>
@@ -206,7 +208,6 @@ <h3>Send Message</h3>
 						<input type="text" id="quickMessageDialogSubject" value=""/>
 						<label for="quickMessageDialogBody">Body</label>
 						<textarea id="quickMessageDialogBody"></textarea>
-						<div id="quickMessageDialogClose" class="RESCloseButton">×</div>
 						<div class="clear"></div>
 						<input type="button" id="quickMessageDialogSend" value="✓ send message"/>
 						<a href="/message/compose" class="fullMessageForm blueButton">open full message form</a>