diff --git a/controllers/Layouts.cfc b/controllers/Layouts.cfc index 13059f9..c50e660 100644 --- a/controllers/Layouts.cfc +++ b/controllers/Layouts.cfc @@ -36,7 +36,8 @@ - + + @@ -51,7 +52,8 @@ - + + diff --git a/controllers/Pages.cfc b/controllers/Pages.cfc index b606963..be8f58c 100644 --- a/controllers/Pages.cfc +++ b/controllers/Pages.cfc @@ -43,7 +43,8 @@ - + + @@ -87,7 +88,9 @@ - + + + diff --git a/controllers/Snippets.cfc b/controllers/Snippets.cfc index ba57fe2..4348030 100644 --- a/controllers/Snippets.cfc +++ b/controllers/Snippets.cfc @@ -11,14 +11,14 @@ - - + + - - + + @@ -41,10 +41,11 @@ - + + - - + + @@ -65,11 +66,12 @@ - + + - - + + diff --git a/db/migrate/20111104073926_namespace_cms_tables.cfc b/db/migrate/20111104073926_namespace_cms_tables.cfc new file mode 100644 index 0000000..4cb5c83 --- /dev/null +++ b/db/migrate/20111104073926_namespace_cms_tables.cfc @@ -0,0 +1,33 @@ + + + + + + + renameTable("categories", "cms_categories"); + renameTable("layouts", "cms_layouts"); + renameTable("pageclasses", "cms_pageclasses"); + renameTable("pageparts", "cms_pageparts"); + renameTable("pages", "cms_pages"); + renameTable("snippets", "cms_snippets"); + renameTable("users", "cms_users"); + + + + + + + + renameTable("cms_categories", "categories"); + renameTable("cms_layouts", "layouts"); + renameTable("cms_pageclasses", "pageclasses"); + renameTable("cms_pageparts", "pageparts"); + renameTable("cms_pages", "pages"); + renameTable("cms_snippets", "snippets"); + renameTable("cms_users", "users"); + + + + + + diff --git a/lib/splash/tags/content.cfm b/lib/splash/tags/content.cfm index 90462a5..27375b2 100644 --- a/lib/splash/tags/content.cfm +++ b/lib/splash/tags/content.cfm @@ -1,21 +1,33 @@ - - +#generateContent()# + + + + + + - - + + + + + + + + + - - + + - + - + - + @@ -23,9 +35,16 @@ - + - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/lib/splash/tags/snippet.cfm b/lib/splash/tags/snippet.cfm index b0a11ce..2a57ab6 100644 --- a/lib/splash/tags/snippet.cfm +++ b/lib/splash/tags/snippet.cfm @@ -1,19 +1,25 @@ - +#generateContent()# + + + + + + - + - + - + - + @@ -22,9 +28,14 @@ - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/models/Category.cfc b/models/Category.cfc index 89f5078..869b3da 100755 --- a/models/Category.cfc +++ b/models/Category.cfc @@ -1,6 +1,7 @@ function init(){ + table("cms_categories"); hasMany('Snippets'); validatesPresenceOf(properties="name", message="Your category must have a name."); diff --git a/models/Layout.cfc b/models/Layout.cfc index d5c60c9..79b1ae3 100644 --- a/models/Layout.cfc +++ b/models/Layout.cfc @@ -1,6 +1,7 @@ + diff --git a/models/Model.cfc b/models/Model.cfc index e25080a..f194378 100755 --- a/models/Model.cfc +++ b/models/Model.cfc @@ -1,11 +1,15 @@ - + + + - + - + + + - + \ No newline at end of file diff --git a/models/Page.cfc b/models/Page.cfc index 71580c5..ebc071c 100644 --- a/models/Page.cfc +++ b/models/Page.cfc @@ -1,10 +1,11 @@ + - + - + diff --git a/models/PageClass.cfc b/models/PageClass.cfc index fdd464b..9372061 100644 --- a/models/PageClass.cfc +++ b/models/PageClass.cfc @@ -5,6 +5,7 @@ + diff --git a/models/PagePart.cfc b/models/PagePart.cfc index 4aa35b2..6525700 100644 --- a/models/PagePart.cfc +++ b/models/PagePart.cfc @@ -5,6 +5,7 @@ + diff --git a/models/Snippet.cfc b/models/Snippet.cfc index 9534c71..2b01dbc 100644 --- a/models/Snippet.cfc +++ b/models/Snippet.cfc @@ -1,6 +1,7 @@ + diff --git a/models/User.cfc b/models/User.cfc index 09b31f9..e9b940d 100644 --- a/models/User.cfc +++ b/models/User.cfc @@ -1,6 +1,7 @@ + diff --git a/plugins/RichText-0.1.zip b/plugins/RichText-0.1.zip deleted file mode 100644 index b6b3a3c..0000000 Binary files a/plugins/RichText-0.1.zip and /dev/null differ diff --git a/plugins/dbmigrate/DBMigrate.cfc b/plugins/dbmigrate/DBMigrate.cfc deleted file mode 100644 index 3a6cd06..0000000 --- a/plugins/dbmigrate/DBMigrate.cfc +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO schemainfo (version) VALUES () - - - - - - - DELETE FROM schemainfo WHERE version = - - - - - - - - - - var loc = {}; - arguments.returnVariable = "loc.returnValue"; - arguments.component = arguments.path & "." & arguments.fileName; - StructDelete(arguments, "path"); - StructDelete(arguments, "fileName"); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - var loc = {}; - loc.migrationNumber = dateformat(now(),'yyyymmdd') & timeformat(now(),'HHMMSS'); - if(arguments.migrationPrefix != "timestamp") { - loc.migrations = getAvailableMigrations(); - if(ArrayLen(loc.migrations) eq 0) { - if(arguments.migrationPrefix == "numeric") { - loc.migrationNumber = "001"; - } - } else { - // determine current numbering system - loc.lastMigration = loc.migrations[ArrayLen(loc.migrations)]; - if(Len(loc.lastMigration.version) eq 3) { - // use numeric numbering - loc.migrationNumber = NumberFormat(Val(loc.lastMigration.version)+1,"009"); - } - } - } - - - - - - - - - SELECT version FROM schemainfo ORDER BY version ASC - - - - CREATE TABLE schemainfo (version VARCHAR(25)) - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/PluginManager-1.0.6.zip b/plugins/pluginmanager-1.0.6.zip similarity index 100% rename from plugins/PluginManager-1.0.6.zip rename to plugins/pluginmanager-1.0.6.zip diff --git a/plugins/richtext-0.1.zip b/plugins/richtext-0.1.zip new file mode 100755 index 0000000..297e6fe Binary files /dev/null and b/plugins/richtext-0.1.zip differ diff --git a/plugins/richtext/README.textile b/plugins/richtext/README.textile index 60d1ac3..eca45d9 100644 --- a/plugins/richtext/README.textile +++ b/plugins/richtext/README.textile @@ -6,8 +6,8 @@ Currently only the Mark-it-up editor and ckEditor are supported and both require h2. Instructions -# Make sure you have the default "files" folder created in the root of your wheels application. -# Copy the folder for the editor you want to use from the plugins/richtext/editors directory into the /files/plugins/richtext directory under the root of your Wheels application. +# Make sure you have the default "files" folder created in the root of your wheels application. +# Copy the folder for the editor you want to use from the plugins/richtext/editors directory into the /files/plugins/richtext directory under the root of your Wheels application. You should end up with the following: 
@@ -21,14 +21,16 @@ The RTE form helpers take the same arguments as textArea and textAreaTag helpers
 
 
 
-#richTextField(objectName='snippet', property='content', rows="15", editor="markitup", includeJSLibrary="false")#
+#richTextField(objectName='snippet', property='content', class="rteditor", rows="15", editor="markitup", includeJSLibrary="false")#
         
-#richTextTag(name="content", rows="15", editor="markitup", includeJSLibrary="false")#
+#richTextTag(name="content", class="rteditor", rows="15", editor="markitup", includeJSLibrary="false")#
 

 
 
 A couple things to note. The "editor" argument tells the method which style of editor to use. The includeJSLibrary argument is used to tell the method wether or not it should include the base javascript library file required by the editor. It defaults to TRUE and in the case of Mark-It-Up it will include a call to the jquery library in the HTML HEAD section. If you are already including jquery in your application for other functionality, just set this to FALSE.
 
+You MUST use the class argument of 'rteditor' in order for the rte to be invoked.
+
 The editor attribute can be either 'markitup' or 'ckeditor'
 
 If using ckEditor, you can pass an addition attribute called 'options' which gets passed into the the editor for configuration. For instance, you can define your own toolbar according the ckEditor docs and then pass those options in as a string.
\ No newline at end of file
diff --git a/plugins/richtext/RichText.cfc b/plugins/richtext/RichText.cfc
index 550ab19..949bf2c 100644
--- a/plugins/richtext/RichText.cfc
+++ b/plugins/richtext/RichText.cfc
@@ -1,4 +1,4 @@
-
+
 
     
     /* 
@@ -10,130 +10,118 @@
         this.version = "1.0.1";
         return this;
     }
+
     
     
     
-	    
-    	
-    	
-    	
-    	
-    	
-    	
-    	
-    	
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
     	
-    	
+    	
     	
-    		var loc = {};
-    		$args(name="textArea", reserved="name", args=arguments);
-    		loc.before = $formBeforeElement(argumentCollection=arguments);
-    		loc.after = $formAfterElement(argumentCollection=arguments);
-    		arguments.name = $tagName(arguments.objectName, arguments.property);
-    		if (!StructKeyExists(arguments, "id"))
-    			arguments.id = $tagId(arguments.objectName, arguments.property);
-    		loc.content = $formValue(argumentCollection=arguments);
-    		loc.returnValue = loc.before & $element(name="textarea", skip="objectName,property,label,labelPlacement,prepend,append,prependToLabel,appendToLabel,errorElement", skipStartingWith="label", content=loc.content, attributes=arguments) & loc.after;
-    		
-    		// call our editor methods
-    		if (arguments.editor is 'markitup'){
-    		    $markItUp(argumentCollection=arguments);
-    		}
-    		if (arguments.editor is 'ckeditor'){
-    		    $ckeditor(argumentCollection=arguments);
-    		}
+			var loc = {};
+    		loc.ret = textArea(argumentCollection=arguments);
+    		$PluginRTEcallEditor(argumentCollection=arguments);
     	
-    	
+    	
     
-    
-    
+       
     
-        
-        
-        
-        
-        
-        
-        
-        
+		
+		
+		
+		
+		
+		
+		
+		
         
-    	
+    	
         
             var loc = {};
-            arguments.property = arguments.name;
-            arguments.objectName = {};
-            arguments.objectName[arguments.name] = arguments.content;
-            StructDelete(arguments, "name");
-            StructDelete(arguments, "content");
-            loc.returnValue = textArea(argumentCollection=arguments);
-            
-            // call our editor methods
-    		if (arguments.editor is 'markitup'){
-    		    $markItUp(argumentCollection=arguments);
-    		}
-    		if (arguments.editor is 'ckeditor') {
-    		    $ckeditor(argumentCollection=arguments);
-    		}
+            loc.ret  = textAreaTag(argumentCollection=arguments);
+			$PluginRTEcallEditor(argumentCollection=arguments);
         
-        
+        
     
 
     
-    
-    
-        
-        
-        
-        
-        
+	
+	
+		
+		
+			
+				
+			
+				
+			
+		
+		
+		    
+		
+			
+		
+	
+	
+	
+		
+		
+			
+			
+		
+	
+		
+    
+		
+		
+        
+		
+		
+		$(document).ready(function(){$("###arguments.id#").markItUp(mySettings);});')>
             
-        
-            
-                
-            
-            
-            '>
-        
-            '>
-        
-            $(document).ready(function(){
-                  // Add markItUp! to our textarea
-                	$(".rteditor").markItUp(mySettings);
-                });'>
-                
-            
-            
-        
+        
+			
+			')>
+			')>
+		
+		
+		
     
     
-    
-        
-        
-        
-        
-        
-            
-        
-            
-        
-        
-        
-            
-                
-            
-            
-             
-'>
-        
-            $(document).ready(function(){
-                  // Add ckEditor to our textarea
-                	$(".rteditor").ckeditor(#options#);
-                });'>
-                
-            
-            
+    
+		
+		
+		
+		
+		
+		
+		$(document).ready(function(){$("###arguments.id#").ckeditor(')>
+        
+			
+				
+			
+				
+			
+			
         
+		')>
+		
+        
+			
+			')>
+		
         
+        
     
     
 
\ No newline at end of file
diff --git a/plugins/Scaffold-0.8.zip b/plugins/scaffold-0.8.zip
similarity index 100%
rename from plugins/Scaffold-0.8.zip
rename to plugins/scaffold-0.8.zip
diff --git a/views/layouts/edit.cfm b/views/layouts/edit.cfm
index 69418d6..49df2eb 100644
--- a/views/layouts/edit.cfm
+++ b/views/layouts/edit.cfm
@@ -8,7 +8,7 @@
 		
 		#includePartial('form')#
 				
-		#submitTag(class="ui-button ui-state-default ui-corner-all", value="Update Layout →")# or #linkTo(text="Cancel", route="layouts_path")#
+		#submitTag(class="ui-button ui-state-default ui-corner-all", value="Update Layout →")# or #linkTo(text="Back to Layouts", route="layouts_path")#
 				
 	#endFormTag()#
 	
diff --git a/views/layouts/new.cfm b/views/layouts/new.cfm
index e38ec8e..5afab0c 100644
--- a/views/layouts/new.cfm
+++ b/views/layouts/new.cfm
@@ -8,7 +8,7 @@
 
     #includePartial('form')#
     
-		#submitTag(class="ui-button ui-state-default ui-corner-all", value="Create Layout →")# or #linkTo(text="Cancel", route="layouts_path")#
+		#submitTag(class="ui-button ui-state-default ui-corner-all", value="Create Layout →")# or #linkTo(text="Back to Layouts", route="layouts_path")#
 				
 	#endFormTag()#
 
\ No newline at end of file
diff --git a/views/pages/edit.cfm b/views/pages/edit.cfm
index 8baba09..7f9566f 100644
--- a/views/pages/edit.cfm
+++ b/views/pages/edit.cfm
@@ -1,7 +1,7 @@
 
 
 

-   
+  
   
   
 

@@ -18,20 +18,20 @@
 
 
 
-			
+
   #errorMessagesFor("page")#
-	
+
 	
 	  #startFormTag(route="update_page_path", parentID=params.parentID, key=params.key, class="form")#
 	
 	  #startFormTag(route="update_page_path", key=params.key, class="form")#
 	    #hiddenField(objectName="page", property="parentID")#
 	
-				
+
 		

 			#textField(objectName='page', property='title', class="text_field", maxlength="255", label="Page Title", labelClass="label")#
 		

-		
+
 			

 				

 					#textField(objectName='page', property='slug', class="text_field slug", maxlength="100", label="Slug", labelClass="label")#
@@ -41,7 +41,7 @@
 				

 				

 					#textField(objectName='page', property='description', class="text_field", maxlength="255", label="Description", labelClass="label")#
-				
	
+				

 				

 					#textField(objectName='page', property='keywords', class="text_field", maxlength="255", label="Keywords", labelClass="label")#
 				

@@ -56,7 +56,7 @@
 	        
 	      
 			
-			
+
 			
 			
 	        

@@ -67,24 +67,24 @@
 
 		

 	 
-		
+
 		

 			#select(objectName='page', property='layoutID', label="Layout ", options=layouts, valueField="id", textField="name", includeBlank="Inherit")#
     	    
-   	  #select(objectName='page', property='pageClassID', label="Page Type 
+   	  #select(objectName='page', property='pageClassID', label="Page Type
 ", options=pageClasses, valueField="id", textField="name")#
     	    
     	#select(objectName="page", property="status", label="Status ", options=status)#
     

-					
-	  
#submitTag(class="ui-button ui-state-default ui-corner-all", value="Update Page →")# or #linkTo(text="Cancel", route="pages_path")#

-		
+
+	  
#submitTag(class="ui-button ui-state-default ui-corner-all", value="Update Page →")# or #linkTo(text="Back to Pages", route="pages_path")#

+
 	#endFormTag()#
-	
+
 	
 	  #includePartial(partial='/shared/last_update', updatedByID=page.updatedByID, updatedAt=page.updatedAt)#
 	
-	
+
 	
 	  

 	  	This page was Published on #dateFormat(page.publishedAt, 'long')# at #timeFormat(page.publishedAt, 'short')#
diff --git a/views/pages/new.cfm b/views/pages/new.cfm
index b19c308..4bcf4bb 100644
--- a/views/pages/new.cfm
+++ b/views/pages/new.cfm
@@ -1,7 +1,7 @@
 
 
 

-   
+  
   
   
 

@@ -18,17 +18,17 @@
 

 
 
-			
+
   #errorMessagesFor("page")#
-	
+
 	#startFormTag(route="create_page_path", parentID=params.parentID, class="form")#
-		
+
 		#hiddenField(objectName="page", property="parentid")#
-				
+
 		

 			#textField(objectName='page', property='title', class="text_field", maxlength="255", label="Page Title", labelClass="label")#
 		

-													
+
 		

 			

 				#textField(objectName='page', property='slug', class="text_field slug", maxlength="100", label="Slug", labelClass="label")#
@@ -38,12 +38,12 @@
 			

 			

 				#textField(objectName='page', property='description', class="text_field", maxlength="255", label="Description", labelClass="label")#
-			
	
+			

 			

 				#textField(objectName='page', property='keywords', class="text_field", maxlength="255", label="Keywords", labelClass="label")#
 			

 		

-		
+
 	  

 	    
 	    
    
@@ -53,7 +53,7 @@
 	        
 	      
 			

-			
+
 			
 			
 	        

@@ -64,18 +64,18 @@
 	    
 
 		

-	 
+
 	  

 			#select(objectName='page', property='layoutID', label="Layout ", options=layouts, valueField="id", textField="name", includeBlank="Inherit")#
     	    
-   	  #select(objectName='page', property='pageClassID', label="Page Type 
+   	  #select(objectName='page', property='pageClassID', label="Page Type
 ", options=pageClasses, valueField="id", textField="name")#
     	    
     	#select(objectName="page", property="status", label="Status ", options=status)#
     

-					
-	  
#submitTag(class="ui-button ui-state-default ui-corner-all", value="Save Page →")# or #linkTo(text="Cancel", route="pages_path")#

-		
+
+	  
#submitTag(class="ui-button ui-state-default ui-corner-all", value="Save Page →")# or #linkTo(text="Back to Pages", route="pages_path")#

+
 	#endFormTag()#
-			
+
 
diff --git a/views/snippets/edit.cfm b/views/snippets/edit.cfm
index bf3d311..1936088 100644
--- a/views/snippets/edit.cfm
+++ b/views/snippets/edit.cfm
@@ -13,7 +13,7 @@
 		
 		#includePartial('form')#
 				
-		#submitTag(class="ui-button ui-state-default ui-corner-all", value="Update Snippet →")# or #linkTo(text="Cancel", route="snippets_path")#
+		#submitTag(class="ui-button ui-state-default ui-corner-all", value="Update Snippet →")# or #linkTo(text="Back to Snippets", route="snippets_path")#
 				
 	#endFormTag()#
 	
diff --git a/views/snippets/new.cfm b/views/snippets/new.cfm
index ac178bf..410749b 100644
--- a/views/snippets/new.cfm
+++ b/views/snippets/new.cfm
@@ -11,7 +11,7 @@
 	
 		#includePartial('form')#
 			
-  	#submitTag(class="ui-button ui-state-default ui-corner-all", value="Create Snippet →")# or #linkTo(text="Cancel", route="snippets_path")#
+  	#submitTag(class="ui-button ui-state-default ui-corner-all", value="Create Snippet →")# or #linkTo(text="Back to Snippets", route="snippets_path")#
 		
 	#endFormTag()#
 	
diff --git a/views/users/edit.cfm b/views/users/edit.cfm
index 3272074..57f119c 100644
--- a/views/users/edit.cfm
+++ b/views/users/edit.cfm
@@ -5,13 +5,13 @@
 	#errorMessagesFor("user")#
 
 	#startFormTag(route="update_user_path", key=params.key, class="form")#
-		
+
 		#includePartial('form')#
-		
-		#submitTag(class="ui-button ui-state-default ui-corner-all", value="Update User →")# or #linkTo(text="Cancel", route="users_path")#
-		
+
+		#submitTag(class="ui-button ui-state-default ui-corner-all", value="Update User →")# or #linkTo(text="Back to Users", route="users_path")#
+
 	#endFormTag()#
-	
+
 	
 	  #includePartial(partial='/shared/last_update', updatedByID=user.updatedByID, updatedAt=user.updatedAt)#
 	
diff --git a/views/users/new.cfm b/views/users/new.cfm
index 7046a06..ec6cd69 100644
--- a/views/users/new.cfm
+++ b/views/users/new.cfm
@@ -4,11 +4,11 @@
 	#errorMessagesFor("user")#
 
 	#startFormTag(route="create_user_path", class="form")#
-	
+
 	  #includePartial('form')#
 
-	  #submitTag(class="ui-button ui-state-default ui-corner-all", value="Create User →")# or #linkTo(text="Cancel", route="users_path")#
-		
+	  #submitTag(class="ui-button ui-state-default ui-corner-all", value="Create User →")# or #linkTo(text="Back to Users", route="users_path")#
+
 	#endFormTag()#