UI Markup

MSU-NatSci · Dec 11, 2017 · 9e41ae1 · 9e41ae1
1 parent 81e787c
commit 9e41ae1
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 139 deletions.
diff --git a/admin/layouts/default.cfm b/admin/layouts/default.cfm
@@ -48,7 +48,6 @@ http://www.apache.org/licenses/LICENSE-2.0
 <cfsavecontent variable="local.newBody">
 	<cfoutput>
 		<script src="/plugins/MuraGoogleSitemaps/assets/js/vue.js" type="text/javascript"></script>
-		<div class="container-murafw1">
 
 			#trim(local.alerts)#
 
@@ -85,7 +84,6 @@ http://www.apache.org/licenses/LICENSE-2.0
 		        </div> <!-- /.tab-pane -->
 		    </div> <!-- /.block-content.tab-content -->			 
 			</div> <!-- /.block.block-constrain -->
-		</div><!--- /.container-murafw1 --->
 	</cfoutput>
 </cfsavecontent>
 <cfoutput>

diff --git a/admin/views/generate/default.cfm b/admin/views/generate/default.cfm
@@ -14,25 +14,16 @@ http://www.apache.org/licenses/LICENSE-2.0
 	<p>Click on the "Generate" button to generate an updated sitemap.</p>
 	<form method="post" action="?gsm=generate">
 		<input type="hidden" name="doprocess" value="1">
-		<div class="block block-constrain" style="min-height: 532px;">
-			<div class="tab-content block-content">
-				<div class="block block-bordered">
-					<div class="block-content">
-						<div class="mura-control-group">
-							<cfif structKeyExists(rc,"time")>
-								<p>Processing Time: #rc.time# ms</p>
-								<p>Location: <a target="new" href="#rc.fileURL#">#rc.fileURL#</a></p>
-							</cfif>
-						</div>
-					</div>
-
-					<div class="mura-actions">
-						<div class="form-actions">
-							<button type="submit" class="btn mura-primary"><i class="mi-check-circle"></i>Generate</button>
-						</div>
-					</div>
-				</div>
+		<div class="mura-control-group">
+			<cfif structKeyExists(rc,"time")>
+				<p>Processing Time: #rc.time# ms</p>
+				<p>Location: <a target="new" href="#rc.fileURL#">#rc.fileURL#</a></p>
+			</cfif>
+		</div>
+		<div class="mura-actions">
+			<div class="form-actions">
+				<button type="submit" class="btn mura-primary"><i class="mi-check-circle"></i>Generate</button>
 			</div>
 		</div>
-	</form>
+</form>
 </cfoutput>
diff --git a/admin/views/news/default.cfm b/admin/views/news/default.cfm
@@ -12,49 +12,43 @@ http://www.apache.org/licenses/LICENSE-2.0
 <cfoutput>
 	<h2>News</h2>
 	<div id="container-gsmnews">
-		<div>
-			<div>
-				<div class="block block-constrain" style="min-height: 532px;">
-					<form method="post" action="?gsm=news" id="newsform">				
-						<div class="mura-control-group">
-							<label for="isEnabled">News Sitemap Enabled</label>
-							<label class="radio inline">
-								<input name="isnewsenabled" type="radio" value="1" class="radio inline" <cfif rc.gsmsettings.get('isnewsenabled') eq 1>checked="checked"</cfif>> Yes
-							</label>
-							<label class="radio inline">
-								<input name="isnewsenabled" type="radio" value="0" class="radio inline" <cfif rc.gsmsettings.get('isnewsenabled') neq 1>checked="checked"</cfif>> No
-							</label>
-						</div>
-
-						<div class="mura-control-group">
-							<label for="newsSource">News Source</label>
-							<select name="newsSource">
-								<option value="">Pick One</option>
-								<cfloop query="#rc.feedlist#">
-									<option value="#rc.feedlist.feedid[currentrow]#" <cfif rc.gsmsettings.get('newssource') eq rc.feedlist.feedid[currentrow]>selected="selected"</cfif>>#rc.feedlist.siteid[currentrow]# - #rc.feedlist.name[currentrow]#</option>
-								</cfloop>
-							</select>
-						</div>
-
-						<div class="tab-content block-content">
-							<h3>Note:</h3>
-							<p>The news sitemap generator will only include content less than two days old (as per Google guidelines). It bases this off of (in order of preference):</p>
-							<ul>
-								<li>Official Release Date</li>
-								<li>Display Date</li>
-								<li>Publish Date (Created)</li>
-							</ul>
-							<p>You must pick a feed for the news sitemap to be generated.</p>
-
-							<div class="mura-actions">
-								<div class="form-actions">
-									<button type="submit" class="btn mura-primary"><i class="mi-check-circle"></i>Save</button>
-								</div>
-							</div>
-						</div>
-					</form>
+		<form method="post" action="?gsm=news" id="newsform">				
+			<div class="mura-control-group">
+				<label for="isEnabled">News Sitemap Enabled</label>
+				<label class="radio inline">
+					<input name="isnewsenabled" type="radio" value="1" class="radio inline" <cfif rc.gsmsettings.get('isnewsenabled') eq 1>checked="checked"</cfif>> Yes
+				</label>
+				<label class="radio inline">
+					<input name="isnewsenabled" type="radio" value="0" class="radio inline" <cfif rc.gsmsettings.get('isnewsenabled') neq 1>checked="checked"</cfif>> No
+				</label>
+			</div>
+
+			<div class="mura-control-group">
+				<label for="newsSource">News Source</label>
+				<select name="newsSource">
+					<option value="">Pick One</option>
+					<cfloop query="#rc.feedlist#">
+						<option value="#rc.feedlist.feedid[currentrow]#" <cfif rc.gsmsettings.get('newssource') eq rc.feedlist.feedid[currentrow]>selected="selected"</cfif>>#rc.feedlist.siteid[currentrow]# - #rc.feedlist.name[currentrow]#</option>
+					</cfloop>
+				</select>
+			</div>
+
+			<h3>Note:</h3>
+			<p>The news sitemap generator will only include content less than two days old (as per Google guidelines). It bases this off of (in order of preference):</p>
+			<ul>
+				<li>Official Release Date</li>
+				<li>Display Date</li>
+				<li>Publish Date (Created)</li>
+			</ul>
+			<p>You must pick a feed for the news sitemap to be generated.</p>
+
+			<div class="mura-actions">
+				<div class="form-actions">
+					<button type="submit" class="btn mura-primary"><i class="mi-check-circle"></i>Save</button>
 				</div>
 			</div>
-		</div>
+
+		</form>
+
 	</div>
 </cfoutput>
diff --git a/admin/views/news/olddefault.cfm b/admin/views/news/olddefault.cfm
@@ -18,7 +18,7 @@ http://www.apache.org/licenses/LICENSE-2.0
 			<div>
 				<criteria-box :criteria="criteria"></criteria-box>
 				<form method="post" action="?gsm=news" id="newsform">
-					<div class="block block-constrain" style="min-height: 532px;">
+					<div class="block block-constrain">
 						<div class="mura-control-group">
 							<label for="isEnabled">News Sitemap Enabled</label>
 							<label class="radio inline">

diff --git a/admin/views/settings/default.cfm b/admin/views/settings/default.cfm
@@ -12,54 +12,47 @@ http://www.apache.org/licenses/LICENSE-2.0
 <cfoutput>
 	<h2>Settings</h2>
 	<form method="post" action="?gsm=settings">
-		<div class="block block-constrain" style="min-height: 532px;">
-			<div class="tab-content block-content">
-				<div class="block block-bordered">
-					<div class="block-content">
-						<div class="mura-control-group">
-							<label for="isEnabled">Enabled</label>
-							<label class="radio inline">
-								<input name="isEnabled" type="radio" value="1" class="radio inline" <cfif rc.gsmsettings.get('isenabled') eq 1>checked="checked"</cfif>> Yes
-							</label>
-							<label class="radio inline">
-								<input name="isEnabled" type="radio" value="0" class="radio inline" <cfif rc.gsmsettings.get('isenabled') neq 1>checked="checked"</cfif>> No
-							</label>
-						</div>
-						<div class="mura-control-group">
-							<label for="location">Location</label>
-							<select name="location" id="sitemap_location">
-								<option value="site" <cfif rc.gsmsettings.get('location') eq "site">selected="selected"</cfif>>Site Folder</option>
-								<option value="web" <cfif rc.gsmsettings.get('location') eq "web">selected="selected"</cfif>>Web Root</option>
-								<option value="custom" <cfif rc.gsmsettings.get('location') eq "custom">selected="selected"</cfif>>Custom</option>
-							</select>
-						</div>
-						<div class="mura-control-group" id="custom_location" style="display: none;">
-							<label for="customlocation">Custom Location</label>
-							<input type="text" name="customlocation" id="customlocation" value="#rc.gsmsettings.get('customlocation')#">
-						</div>
-						<div class="mura-control-group">
-							<label for="frequency">Update Frequency</label>
-							<select name="frequency">
-								<option value="daily" <cfif rc.gsmsettings.get('frequency') eq "daily">selected="selected"</cfif>>Daily</option>
-								<option value="weekly" <cfif rc.gsmsettings.get('frequency') eq "weekly">selected="selected"</cfif>>Weekly</option>
-								<option value="monthly" <cfif rc.gsmsettings.get('frequency') eq "monthly">selected="selected"</cfif>>Monthly</option>
-							</select>
-						</div>
-						<!---
-						<div class="mura-control-group">
-								<label for="notifyemail">Notification</label>
-								<input name="notifyemail" type="text" value="#rc.gsmsettings.get('notifyemail')#">
-						</div>
-						--->
-					</div>
-					<div class="mura-actions">
-						<div class="form-actions">
-							<button type="submit" class="btn mura-primary"><i class="mi-check-circle"></i>Save</button>
-						</div>
-					</div>
-				</div>
-			</div>
+		<div class="mura-control-group">
+			<label for="isEnabled">Enabled</label>
+			<label class="radio inline">
+				<input name="isEnabled" type="radio" value="1" class="radio inline" <cfif rc.gsmsettings.get('isenabled') eq 1>checked="checked"</cfif>> Yes
+			</label>
+			<label class="radio inline">
+				<input name="isEnabled" type="radio" value="0" class="radio inline" <cfif rc.gsmsettings.get('isenabled') neq 1>checked="checked"</cfif>> No
+			</label>
 		</div>
+		<div class="mura-control-group">
+			<label for="location">Location</label>
+			<select name="location" id="sitemap_location">
+				<option value="site" <cfif rc.gsmsettings.get('location') eq "site">selected="selected"</cfif>>Site Folder</option>
+				<option value="web" <cfif rc.gsmsettings.get('location') eq "web">selected="selected"</cfif>>Web Root</option>
+				<option value="custom" <cfif rc.gsmsettings.get('location') eq "custom">selected="selected"</cfif>>Custom</option>
+			</select>
+		</div>
+		<div class="mura-control-group" id="custom_location" style="display: none;">
+			<label for="customlocation">Custom Location</label>
+			<input type="text" name="customlocation" id="customlocation" value="#rc.gsmsettings.get('customlocation')#">
+		</div>
+		<div class="mura-control-group">
+			<label for="frequency">Update Frequency</label>
+			<select name="frequency">
+				<option value="daily" <cfif rc.gsmsettings.get('frequency') eq "daily">selected="selected"</cfif>>Daily</option>
+				<option value="weekly" <cfif rc.gsmsettings.get('frequency') eq "weekly">selected="selected"</cfif>>Weekly</option>
+				<option value="monthly" <cfif rc.gsmsettings.get('frequency') eq "monthly">selected="selected"</cfif>>Monthly</option>
+			</select>
+		</div>
+		<!---
+		<div class="mura-control-group">
+				<label for="notifyemail">Notification</label>
+				<input name="notifyemail" type="text" value="#rc.gsmsettings.get('notifyemail')#">
+		</div>
+		--->
+	<div class="mura-actions">
+		<div class="form-actions">
+			<button type="submit" class="btn mura-primary"><i class="mi-check-circle"></i>Save</button>
+		</div>
+	</div>
+
 	</form>
 </cfoutput>
 

diff --git a/admin/views/translations/default.cfm b/admin/views/translations/default.cfm
@@ -12,36 +12,26 @@ http://www.apache.org/licenses/LICENSE-2.0
 <cfoutput>
 	<h2>Translations</h2>
 	<form method="post" action="?gsm=translations">
-		<div class="block block-constrain" style="min-height: 532px;">
-			<div class="tab-content block-content">
-				<div class="block block-bordered">
-
-					<div class="block-content">
-						<cfset rc.assignedsites = rc.translations.getAssignedSites() />
-						<p>With Mura Translations installed, you can include reference links to translated pages.<p>
-						<p>Include reference links to the following sites:</p>
-						<cfloop query="#rc.assignedsites#">
-							<cfif rc.assignedsites.siteid[currentrow] neq session.siteid>
-								<cfset site = $.getBean('site').loadby(siteid=siteid)>
-								<div class="mura-control-group">
-									<label for="isEnabled">#site.get('site')# (#siteid#)</label>
-									<label class="checkbox inline">
-										<input name="sitelist" type="checkbox" value="#siteid#" class="radio inline" <cfif listContains(rc.gsmsettings.get('sitelist'),siteid)>checked="checked"</cfif>> Yes
-									</label>
-								</div>
-							</cfif>
-						</cfloop>
-					</div>
-
-					<div class="mura-actions">
-						<div class="form-actions">
-							<button type="submit" class="btn mura-primary"><i class="mi-check-circle"></i>Save</button>
-						</div>
-					</div>
-
+		<cfset rc.assignedsites = rc.translations.getAssignedSites() />
+		<p>With Mura Translations installed, you can include reference links to translated pages.<p>
+		<p>Include reference links to the following sites:</p>
+		<cfloop query="#rc.assignedsites#">
+			<cfif rc.assignedsites.siteid[currentrow] neq session.siteid>
+				<cfset site = $.getBean('site').loadby(siteid=siteid)>
+				<div class="mura-control-group">
+					<label for="isEnabled">#site.get('site')# (#siteid#)</label>
+					<label class="checkbox inline">
+						<input name="sitelist" type="checkbox" value="#siteid#" class="radio inline" <cfif listContains(rc.gsmsettings.get('sitelist'),siteid)>checked="checked"</cfif>> Yes
+					</label>
 				</div>
-			</div>
+			</cfif>
+		</cfloop>
+
+	<div class="mura-actions">
+		<div class="form-actions">
+			<button type="submit" class="btn mura-primary"><i class="mi-check-circle"></i>Save</button>
 		</div>
+	</div>
 		<input type="hidden" name="issubmitted" value="true">
 	</form>
 </cfoutput>