Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Cleaned up the markup a bit

  • Loading branch information...
commit eaa51f54974822449142cf3200072ddcb03a3bd7 1 parent fbf0e24
@raulriera raulriera authored committed
View
13 javascripts/application.js
@@ -4,4 +4,15 @@ var fixHelper = function(e, ui) {
$(this).width($(this).width());
});
return ui;
-};
+};
+
+$(document).ready(function(){
+
+ // this adds the nice hover state to all of our buttons
+ $('.ui-button').hover(function() {
+ $(this).addClass("ui-state-hover");
+ }, function() {
+ $(this).removeClass("ui-state-hover");
+ });
+
+});
View
10 stylesheets/base.css
@@ -467,3 +467,13 @@ ul.error-messages li {
.page-properties {
float:right;
}
+
+/* dialogs */
+#dialog label, #dialog input { display:block; }
+#dialog label { margin-top: 0.5em; }
+#dialog input, #dialog textarea { width: 95%; }
+
+/* tabs */
+#tabs { margin-top: 1em; }
+#tabs li .ui-icon-close { float: left; margin: 0.4em 0.2em 0 0; cursor: pointer; }
+#add_tab, #hideShow { cursor: pointer; }
View
1  stylesheets/themes/blue/style.css
@@ -1,5 +1,6 @@
.small { font-size:12px; }
.gray { color:#999999; }
+.red {color:#ff0000;}
.hightlight { background-color:#FFFFCC; }
a:link, a:visited, a:hover, a:active, h1, h2, h3 { color: #0073ea; }
View
17 views/layout.cfm
@@ -2,9 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>
- <cfoutput>#application.admin.title#</cfoutput>
- </title>
+ <title><cfoutput>#application.admin.title#</cfoutput></title>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js" type="text/javascript"></script>
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js" type="text/javascript"></script>
@@ -21,19 +19,6 @@
<cfoutput>#javascriptIncludeTag("snippets")#</cfoutput>
</cfif>
- <script type="text/javascript">
- $(document).ready(function(){
-
- // this adds the nice hover state to all of our buttons
- $('.ui-button').hover(function() {
- $(this).addClass("ui-state-hover");
- }, function() {
- $(this).removeClass("ui-state-hover");
- });
-
- });
- </script>
-
</head>
<body>
<div id="container">
View
17 views/pages/edit.cfm
@@ -1,14 +1,5 @@
<cfhtmlhead text='<script type="text/javascript" src="/javascripts/jquery.slug.js"></script>'>
-<style type="text/css">
- #dialog label, #dialog input { display:block; }
- #dialog label { margin-top: 0.5em; }
- #dialog input, #dialog textarea { width: 95%; }
- #tabs { margin-top: 1em; }
- #tabs li .ui-icon-close { float: left; margin: 0.4em 0.2em 0 0; cursor: pointer; }
- #add_tab, #hideShow { cursor: pointer; }
-</style>
-
<div class="page-properties">
<button id="add_tab" class="ui-button ui-state-default ui-corner-all">Add Page Part</button>
<button id="hideShow" class="ui-button ui-state-default ui-corner-all">Page Properties</button>
@@ -43,7 +34,7 @@
<div class="more">
<p><label class="label">Slug</label>
- #textField(objectName='page', property='slug', class="text_field slug")#</p>
+ #textField(objectName='page', property='slug', class="text_field slug")#</p>
<p><label class="label">Breadcrumb</label>
#textField(objectName='page', property='breadcrumb', class="text_field")#</p>
@@ -84,7 +75,7 @@
#select(objectName='page', property='pageClassID', options=pageClasses, valueField="id", textField="name")#
&nbsp;&nbsp;&nbsp;&nbsp;
<label><strong>Status</strong></label>
- #select(objectName="page", property="status", options=status)#
+ #select(objectName="page", property="status", options=status)#
</p>
<p>#submitTag(class="ui-button ui-state-default ui-corner-all", value="Update Page &rarr;")# or #linkTo(text="Cancel", route="pages_path")#</p>
@@ -97,7 +88,7 @@
<cfif page.publishedAt is NOT "">
<p class="gray">
- This page was Published on #dateFormat(page.publishedAt, 'long')# at #timeFormat(page.publishedAt, 'short')#
- </p>
+ This page was Published on #dateFormat(page.publishedAt, 'long')# at #timeFormat(page.publishedAt, 'short')#
+ </p>
</cfif>
</cfoutput>
View
16 views/pages/index.cfm
@@ -5,17 +5,17 @@
// expand the home node by default
$("#node-1").expand();
});
- </script>
+</script>
<h1>Pages</h1>
<table id="pageTree" class="table">
<thead>
- <tr>
- <th class="first">Page</th>
- <th>Status</th>
- <th class="last">&nbsp;</th>
- </tr>
+ <tr>
+ <th class="first">Page</th>
+ <th>Status</th>
+ <th class="last">&nbsp;</th>
+ </tr>
</thead>
<tbody>
<cfoutput query="pages">
@@ -28,9 +28,9 @@
</cfif>
#linkTo(text=pageTitle, route="edit_page_path", key=id, parentID=parentid, class="page")#
</td>
- <td><cfif status is "Draft"><span style="color:red;">#status#</span><cfelse>#status#</cfif></td>
+ <td><cfif status is "Draft"><span class="red">#status#</span><cfelse>#status#</cfif></td>
<td>
- #linkTo(text='#imageTag("add-child.png")#', route='new_page_path', parentid=id)#
+ #linkTo(text='#imageTag("add-child.png")#', route='new_page_path', parentid=id)#
<cfif parentId is '0'>
#imageTag("remove-disabled.png")#
<cfelse>
View
11 views/pages/new.cfm
@@ -1,14 +1,5 @@
<cfhtmlhead text='<script type="text/javascript" src="/javascripts/jquery.slug.js"></script>'>
-<style type="text/css">
- #dialog label, #dialog input { display:block; }
- #dialog label { margin-top: 0.5em; }
- #dialog input, #dialog textarea { width: 95%; }
- #tabs { margin-top: 1em; }
- #tabs li .ui-icon-close { float: left; margin: 0.4em 0.2em 0 0; cursor: pointer; }
- #add_tab, #hideShow { cursor: pointer; }
-</style>
-
<div class="page-properties">
<button id="add_tab" class="ui-button ui-state-default ui-corner-all">Add Page Part</button>
<button id="hideShow" class="ui-button ui-state-default ui-corner-all">Page Properties</button>
@@ -81,7 +72,7 @@
#select(objectName='page', property='pageClassID', options=pageClasses, valueField="id", textField="name")#
&nbsp;&nbsp;&nbsp;&nbsp;
<label><strong>Status</strong></label>
- #select(objectName="page", property="status", options=status)#
+ #select(objectName="page", property="status", options=status)#
</p>
<p>#submitTag(class="ui-button ui-state-default ui-corner-all", value="Save Page &rarr;")# or #linkTo(text="Cancel", route="pages_path")#</p>
View
2  views/users/index.cfm
@@ -8,7 +8,7 @@
</tr>
<cfoutput query="users">
<tr>
- <td>
+ <td>
#linkTo(text="#name#", route="edit_user_path", key="#id#", class="user")# <span class="gray">#username#</span>
</td>
<td>
Please sign in to comment.
Something went wrong with that request. Please try again.