YurtCMS 0.2.0 → 0.3.1

data/lib/yurtcms.rb

@@ -1,6 +1,7 @@
 
 	require 'yaml'
 
+
 	class YurtCMS
 		attr_reader :data_store, :web_root, :includes, :metatags, :partial, :ext
 		def initialize yurt_root
@@ -132,12 +133,19 @@
 						Dir.delete( f )
 					end
 				else
+					metadata = YAML.load( File.open( f ) )
+					
 					File.delete( f )
-					[ :path_to_metatags,
-						:path_to_content,
-						:path_to_placeholder ].each do |p|
-						f = send( p, obj )
-						File.delete( f )
+
+					if metadata['partial'] == 'y'
+						File.delete( path_to_content( obj ) )
+					else
+						[ :path_to_metatags,
+							:path_to_content,
+							:path_to_placeholder ].each do |p|
+							f = send( p, obj )
+							File.delete( f )
+						end
 					end
 				end
 			end
@@ -165,11 +173,11 @@
 			path = merge( input.path, sanitize_filename( input.filename ) )
 
 			write_file( path_to_orig_content( path ), make_content_as_yaml( input ) )
-			write_file( path_to_placeholder( path ), make_placeholder( path, input.template ) )
 			write_file( path_to_content( path ), parse_content( input.content ) )
 
 			if input.partial != "y"
 				write_file( path_to_metatags( path ), make_metatags( input ) )
+				write_file( path_to_placeholder( path ), make_placeholder( path, input.template ) )
 			end
 		end
 	end

data/site/yurt/index.html

@@ -51,21 +51,24 @@
 					}
 
 					function dispatch(url) {
+						Element.show('spinner');
 						url = url + "/" + resource;
 						var pars = '';
 						var target = 'workspace';
-						var myAjax = new Ajax.Updater(target, url, {method: 'get', parameters: pars});
+						var myAjax = new Ajax.Updater(target, url, {method: 'get', parameters: pars, evalScripts: true});
 						hideMenus();
 					}
 
 					function dispatch_post(url,formname) {
+						Element.show('spinner');
 						var pars = Form.serialize(formname);
 						var target = 'workspace';
-						var myAjax = new Ajax.Updater(target, url, {method: 'post', parameters: pars});
+						var myAjax = new Ajax.Updater(target, url, {method: 'post', parameters: pars, evalScripts: true});
 						hideMenus();
 					}
 
 					function openFolder(url) {
+						Element.show('spinner');
 						url = url + "/" + resource;
 						var pars = '';
 						var target;
@@ -80,13 +83,14 @@
 					}
 
 					function preview(content) {
+						Element.show('spinner');
 						// use an argument looking like this: document.forms["newfile"].content.value
 
 						var url = "/yurt/yurt.cgi/preview/"
 						var pars = 'c=' + escape( content );
 						var target = 'nf_preview';
 
-						var myAjax = new Ajax.Updater(target, url, {method: 'post', parameters: pars});
+						var myAjax = new Ajax.Updater(target, url, {method: 'post', parameters: pars, evalScripts: true});
 					}
 
 					function hideMenus() {
@@ -130,6 +134,7 @@
 			<li><a href="/yurt/yurt.cgi/edit" class="first" onclick="dispatch(this.href); return false;">Edit file...</a></li>
 			<li><a href="/yurt/yurt.cgi/delete" onclick="dispatch(this.href); return false;">Delete</a></li>
 		</ul>
+		<div id="spinner" style="display: none;"><img src="/yurt/media/images/spinner.gif" width="16" height="16" border="0" alt="" /></div>
 	</body>
 </html>
 

data/site/yurt/media/css/styles.css

@@ -25,7 +25,7 @@
 
 					.listing {
 						list-style: none;
-						font-family: Geneva;
+						font-family: Geneva, verdana;
 					}
 						  
 					#filelist li, #filelist ul {
@@ -102,13 +102,14 @@
 						background-color: #ddddd8;
 						border-top: 1px solid #000;
 						padding: 0.3em;
+						font-family: Geneva, verdana, sans-serif;
 					}
 
 					.actions {
 						margin: 0;
 						padding: 0;
 						list-style: none;
-						font-family: chicago;
+						font-family: chicago, verdana, sans-serif;
 						font-size: 0.9em;
 						width: 140px;
 						background-color: #eeeeec;
@@ -153,3 +154,31 @@
 					#directory_actions, #file_actions {
 						position: absolute;
 					}
+
+					#spinner {
+						position: absolute;
+						left: 70px;
+						top: 106px;
+					}
+
+					#nf_help table {
+						border-collapse: collapse;
+					}
+
+					#nf_help th {
+						font-size: 1.5em;
+						border: 1px solid black;
+						padding: 0.5em;
+						margin: 0;
+					}
+
+					#nf_help td {
+						border: 1px solid black;
+						padding: 1em;
+						margin: 0;
+					}
+
+					#nf_help td.code {
+						font-family: monospace;
+					}
+

data/site/yurt/yurt.cgi

@@ -2,7 +2,7 @@
 
 require 'yurtcms'
 require 'camping'
-require 'BlueCloth'
+require 'bluecloth'
 
 Camping.goes :Yurt
 
@@ -53,7 +53,6 @@ module Yurt::Controllers
 	class New_File < R '/new_file/([\w\/\.\-\_]*)'
 		def get path
 			@y = get_yurtcms
-			@p = @y.sanitize_path( path )
 
 			@f = Hash.new
 			@f['title'] = "page_title"
@@ -62,6 +61,7 @@ module Yurt::Controllers
 			@f['content'] = ""
 			@f['filename'] = "file_name"
 			@f['partial'] = ""
+			@f['path'] = @y.sanitize_path( path )
 
 			render :new_file
 		end
@@ -164,17 +164,18 @@ module Yurt::Views
 			text "  x[x.length] = '" +@p + "/" + file + "';"
 		end
 			text "  new EventDispenser(x);"
+			text "  Element.hide('spinner');"
 	 end
  end
 
  def new_file
 	 text %Q(
-	<form action="/yurt/yurt.cgi/new_file/" method="post" name="newfile" class="dialog_box" id="newfile">
+	<form action="/yurt/yurt.cgi/new_file/" method="post" name="newfile" class="dialog_box" id="newfile" onsubmit="dispatch_post('/yurt/yurt.cgi/new_file/', 'newfile');return false;">
 		<fieldset>
 		<legend>
-			<a href="#" onclick="toggleTabs('nf_dialog', 'nf_preview', 'nf_help');">New File</a> | 
-			<a href="#" onclick="toggleTabs('nf_preview', 'nf_dialog', 'nf_help');preview(document.forms['newfile'].content.value);">Preview</a> | 
-			<a href="#" onclick="toggleTabs('nf_help', 'nf_dialog', 'nf_preview');">Help</a>
+			<a href="#" onclick="toggleTabs('nf_dialog', 'nf_preview', 'nf_help');return false;">New File</a> | 
+			<a href="#" onclick="toggleTabs('nf_preview', 'nf_dialog', 'nf_help');preview(document.forms['newfile'].content.value);return false;">Preview</a> | 
+			<a href="#" onclick="toggleTabs('nf_help', 'nf_dialog', 'nf_preview');return false;">Help</a>
 		</legend>
 		<div id="nf_dialog" class="dialog">
 			<label><input type="text" name="filename" value="#{ @f['filename'] }" /> File name</label>
@@ -187,31 +188,154 @@ module Yurt::Views
 			</div>
 			<textarea name="content" class="contentarea">#{ @f['content'] }</textarea>
 			<input type="hidden" name="path" value="#{@f['path']}" />
-			<input type="button" name="add" value="Add" onclick="dispatch_post('/yurt/yurt.cgi/new_file/', 'newfile')" />
+			<input type="button" name="add" value="Save" onclick="dispatch_post('/yurt/yurt.cgi/new_file/', 'newfile')" />
 			<input type="button" name="cancel" value="Cancel" onclick="dispatch('/yurt/yurt.cgi/cancel')" />
 		</div>
 		<div id="nf_preview" class="preview" style="display: none;">
 		</div>
 		<div id="nf_help" class="help" style="display: none;">
-			<p>A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines. (A blank line is any line that looks like a blank line � a line containing nothing but spaces or tabs is considered blank.) Normal paragraphs should not be intended with spaces or tabs.</p>
+			<p>The following chart will assist you as you're entering content.</p>
+			<table>
+				<tr>
+					<th>To Get:</th>
+					<th>Type:</th>
+				</tr>
+				<tr>
+					<td>A paragraph.</td>
+					<td>- one or more consecutive lines of text, followed by one or more blank lines.</td>
+				</tr>
+				<tr>
+					<td><h1>Heading 1</h1></td>
+					<td class="code"># Heading 1</td>
+				</tr>
+				<tr>
+					<td><h2>Heading 2</h2></td>
+					<td class="code">## Heading 2</td>
+				</tr>
+				<tr>
+					<td><h3>Heading 3</h3></td>
+					<td class="code">### Heading 3</td>
+				</tr>
+				<tr>
+					<td><h4>Heading 4</h4></td>
+					<td class="code">#### Heading 4</td>
+				</tr>
+				<tr>
+					<td><h5>Heading 5</h5></td>
+					<td class="code">##### Heading 5</td>
+				</tr>
+				<tr>
+					<td><h6>Heading 6</h6></td>
+					<td class="code">###### Heading 6</td>
+				</tr>
+				<tr>
+					<td><blockquote>
+	Insert a blockquote
+					</blockquote></td>
+					<td class="code">&gt; one or more consecutive lines that start with '&gt; ', followed by one or more blank lines.</td>
+				</tr>
+				<tr>
+					<td><ul>
+							<li>bullet list</li>
+							<li>bullet list</li>
+					</ul></td>
+					<td class="code">* bullet list<br />* bullet list</td>
+				</tr>
+				<tr>
+					<td><ol>
+							<li>numbered list</li>
+							<li>numbered list</li>
+					</ol></td>
+					<td class="code">1. numbered list<br />2. numbered list</td>
+				</tr>
+				<tr>
+					<td><hr /></td>
+					<td class="code">---- (3 or more hyphens)</td>
+				</tr>
+				<tr>
+					<td><a href="#">A link</a></td>
+					<td class="code">[A link](url goes here)</td>
+				</tr>
+				<tr>
+					<td><em>Italics</em></td>
+					<td class="code">*Italics*</td>
+				</tr>
+				<tr>
+					<td><strong>Bold</strong></td>
+					<td class="code">**Bold**</td>
+				</tr>
+				<tr>
+					<td>adding an image</td>
+					<td class="code">![alt text](path/to/image.jpg)</td>
+				</tr>
+				<tr>
+					<td colspan="2">In unusual circumstances, you might need some of the characters that were used above in it's literal sense.  To get them, consult the following chart.</td>
+				</tr>
+				<tr>
+					<td>\\</td>
+					<td class="code">\\\\</td>
+				</tr>
+				<tr>
+					<td>`</td>
+					<td class="code">\\`</td>
+				</tr>
+				<tr>
+					<td>*</td>
+					<td class="code">\\*</td>
+				</tr>
+				<tr>
+					<td>_</td>
+					<td class="code">\\_</td>
+				</tr>
+				<tr>
+					<td>#</td>
+					<td class="code">\\#</td>
+				</tr>
+				<tr>
+					<td>.</td>
+					<td class="code">\\. (this is extremely rare)</td>
+				</tr>
+				<tr>
+					<td>!</td>
+					<td class="code">\\!</td>
+				</tr>
+				<tr>
+					<td>{}</td>
+					<td class="code">\\{\\}</td>
+				</tr>
+				<tr>
+					<td>()</td>
+					<td class="code">\\(\\)</td>
+				</tr>
+				<tr>
+					<td>[]</td>
+					<td class="code">\\[\\]</td>
+				</tr>
+				<tr>
+					<td colspan="2">If you need a more complete understanding of the Markdown syntax used in here, please consult <a href="http://daringfireball.net/projects/markdown/syntax" target="_new">the original Markdown syntax guide</a>.</td>
+				</tr>
+			</table>
 		</div>
 		</fieldset>
 	</form>
-	)
+		)
+		script do 
+			text "  Element.hide('spinner');"
+		end
 	end
 
   def new_folder
 		text %Q(
-		<form action="/yurt/yurt.cgi/new_folder/" method="post" name="newfolder" class="dialog_box" id="newfolder">
+		<form action="/yurt/yurt.cgi/new_folder/" method="post" name="newfolder" class="dialog_box" id="newfolder" onsubmit="dispatch_post('/yurt/yurt.cgi/new_folder/', 'newfolder');return false;">
 		<fieldset>
 		<legend>
-			<a href="#" onclick="toggleTabs('nf_dialog', 'nf_help');">New Folder</a> | 
-			<a href="#" onclick="toggleTabs('nf_help', 'nf_dialog');">Help</a>
+			<a href="#" onclick="toggleTabs('nf_dialog', 'nf_help');return false;">New Folder</a> | 
+			<a href="#" onclick="toggleTabs('nf_help', 'nf_dialog');return false;">Help</a>
 		</legend>
 		<div id="nf_dialog" class="dialog">
 		<label><input type="text" name="foldername" value="" /> Folder name</label>
 		<input type="hidden" name="path" value="#{@p}" />
-		<input type="button" name="add" value="Add" onclick="dispatch_post('/yurt/yurt.cgi/new_folder/', 'newfolder')" />
+		<input type="button" name="add" value="Save" onclick="dispatch_post('/yurt/yurt.cgi/new_folder/', 'newfolder')" />
 		<input type="button" name="cancel" value="Cancel" onclick="dispatch('/yurt/yurt.cgi/cancel')" />
 		</div>
 		<div id="nf_help" class="help" style="display: none;">
@@ -220,26 +344,44 @@ module Yurt::Views
 		</fieldset>
 		</form>
 		)
+		script do 
+			text "  Element.hide('spinner');"
+	 	end
 	end
 
 	def preview
 		text @p
+		script do 
+			text "  Element.hide('spinner');"
+	 	end
 	end
 
 	def folder_created
 		text %q(<p>The folder was successfully created.</p>)
+		script do 
+			text "  Element.hide('spinner');"
+	 	end
 	end
 
 	def file_created
 		text %q(<p>The file was successfully created.</p>)
+		script do 
+			text "  Element.hide('spinner');"
+	 	end
 	end
 
 	def delete
 		text %q(<p>The Deletion was successful.</p>)
+		script do 
+			text "  Element.hide('spinner');"
+	 	end
 	end
  
 	def cancel
 		text " "
+		script do 
+			text "  Element.hide('spinner');"
+	 	end
 	end
  
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: YurtCMS
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-10-11 00:00:00 -04:00
+  version: 0.3.1
+date: 2006-11-13 00:00:00 -05:00
 summary: The Web CMS that does less!
 require_paths: 
 - lib
@@ -68,6 +68,7 @@ files:
 - site/yurt/media/images/directory.png
 - site/yurt/media/images/file.png
 - site/yurt/media/images/pane_bg.gif
+- site/yurt/media/images/spinner.gif
 - site/yurt/media/js/prototype.js
 - test/cms_filesystem.rb
 - test/cms_strings.rb