app/views/simple_cms_images/_show_image_list.rhtml.backup.2008_08_20 app/views/simple_cms_images/_show_image_list.rhtml.good_ie assets/javascripts/tiny_mce/plugins/ts_advimage/css/advimage.css.backup.2008_08_20 assets/javascripts/tiny_mce/plugins/ts_advimage/css/advimage.css.good_ie assets/javascripts/tiny_mce/plugins/ts_advimage/images/delete-icon.jpg assets/javascripts/tiny_mce/plugins/ts_advimage/images/delete-icon_grey.jpg assets/javascripts/tiny_mce/plugins/ts_advimage/jscripts/functions.js.backup.2008_08_20 assets/javascripts/tiny_mce_init.js lib/render.rb lib/view_paths.rb tasks/convert_simple_cms_params.rake tasks/dev_to_prod_tasks.rake @@ -4,18 +4,21 @@ SimpleCMS Created by Slaive and PullMonkey (December 2007). This is a very good, easy to use cms plugin. -This plugin is built for rails version 2.0.2. So if you are using an older +This plugin is built for rails versions <= 2.1.0. So if you are using an older version of rails then you will need to edit each of the controllers -from: +uncomment this for rails versions >= 2.0 and < 2.1 self.view_paths << File.join(File.dirname(__FILE__), '..', 'views') -to: +uncomment this for rails versions < 2.0 self.template_root = File.join(File.dirname(__FILE__), '..', 'views') +and comment out this in the lib/simple_cms.rb file + self.append_view_paths File.join(File.dirname(__FILE__), '..', 'app', 'views') + SimpleCMS dependencies ====================== -Once you have SimpleCMS installed you will need to install 3 more plugins: +Once you have SimpleCMS installed you will need to install 4 more plugins: - attachment_fu - responds_to_parent - acts_as_versioned @@ -26,8 +29,11 @@ You can do this easily by using the command: If this doesn't work you can do it manually by doing the following commands: ruby script/plugin install http://svn.pullmonkey.com/plugins/trunk/attachment_fu/ ruby script/plugin install http://svn.pullmonkey.com/plugins/trunk/responds_to_parent/ - ruby script/plugin install http://svn.pullmonkey.com/plugins/trunk/acts_as_versioned/ ruby script/plugin install http://svn.pullmonkey.com/plugins/trunk/coderay/ + If you are using rails versions >= 2.1.1 then install this one + ruby script/plugin install http://svn.pullmonkey.com/plugins/trunk/acts_as_versioned_2.1.1/ + If you are using rails versions < 2.1.1 then install this one + ruby script/plugin install http://svn.pullmonkey.com/plugins/trunk/acts_as_versioned/ You will also need to have an image processor installed. There are 3 to choose from: README @@ -1,10 +1,12 @@ class SimpleCmsImagesController < ApplicationController - # For Rails version 2.1 and greater - self.append_view_path(File.join(File.dirname(__FILE__), '..', 'views')) - # For Rails version 2.0 and greater - #self.view_paths << File.join(File.dirname(__FILE__), '..', 'views') - # For Rails versions less than 2.0 - #self.template_root = File.join(File.dirname(__FILE__), '..', 'views') + # For Rails version >= 2.1 + # uncomment self.append_view_path File.join(File.dirname(__FILE__), '..', 'app', 'views') + # in lib/simple_cms.rb file + # For Rails version >= 2.0 and < 2.1 + #self.view_paths << File.join(File.dirname(__FILE__), '..', 'views') + # For Rails versions < 2.0 + #self.template_root = File.join(File.dirname(__FILE__), '..', 'views') + skip_before_filter :verify_authenticity_token def index @@ -58,9 +60,8 @@ class SimpleCmsImagesController < ApplicationController @image = SimpleCmsImage.find(params[:id]) @image.destroy - respond_to do |format| - # format.html { redirect_to my_image_url } - format.xml { head :ok } + render :update do |page| + page["image_#{params[:id]}"].remove end end end app/controllers/simple_cms_images_controller.rb @@ -1,46 +1,50 @@ class SimpleCmsItemsController < ApplicationController - # For Rails version 2.1 and greater - self.append_view_path(File.join(File.dirname(__FILE__), '..', 'views')) - # For Rails version 2.0 and greater + # For Rails version >= 2.1 + # uncomment self.append_view_path File.join(File.dirname(__FILE__), '..', 'app', 'views') + # in lib/simple_cms.rb file + # For Rails version >= 2.0 and < 2.1 #self.view_paths << File.join(File.dirname(__FILE__), '..', 'views') - # For Rails versions less than 2.0 + # For Rails versions < 2.0 #self.template_root = File.join(File.dirname(__FILE__), '..', 'views') skip_before_filter :verify_authenticity_token #before_filter :authenticate require 'coderay' layout 'plugin' - #caches_action :content def edit - logger.error("\ncms_referer: " + session["cms_referer"].to_s + "\n\n") + @simple_cms_item = SimpleCmsItem.find(params[:id]) + referer = session[:cms_data][@simple_cms_item.params][:referer] + #logger.error("\nsession data: " + session[:cms_data].inspect + "\n\n") + logger.error("\ncms_referer: " + referer.to_s + "\n\n") # if no referer, then redirect to base root of application # the user jumped to edit without going through the interface # this is a no no for many reasons - if session["cms_referer"].nil? - logger.error("\nThere was no referer!!\n\n") + if referer.nil? # derive base root path path = request.env["REQUEST_PATH"].gsub(/simple_cms_items.*$/, "") redirect_to path return end - @simple_cms_item = SimpleCmsItem.find(params[:id]) @versions = @simple_cms_item.versions -################ CHECK THIS ########## @cms_item_version = @simple_cms_item - @prefix = session["cms_prefix"][@simple_cms_item.params] + @prefix = session[:cms_data][@simple_cms_item.params][:prefix] # if user is not an admin, redirect to the refering page - if !session["cms_admin"][@simple_cms_item.params] - redirect_to session["cms_referer"] + if !session[:cms_data][@simple_cms_item.params][:admin] + redirect_to referer return elsif request.post? + if params[:commit] == "Cancel" + redirect_to referer + return + end if !(@simple_cms_item.data.to_s == params[:simple_cms_item][:data].to_s) - @simple_cms_item.updated_by = session["cms_user"][@simple_cms_item.params] + @simple_cms_item.updated_by = session[:cms_data][@simple_cms_item.params][:user] @simple_cms_item.update_attributes(params[:simple_cms_item]) else logger.error("\nUser did not make any changes\n") end - redirect_to session["cms_referer"] + redirect_to referer return end end app/controllers/simple_cms_items_controller.rb @@ -1,9 +1,10 @@ class SimpleCmsMediaController < ApplicationController - # For Rails version 2.1 and greater - self.append_view_path(File.join(File.dirname(__FILE__), '..', 'views')) - # For Rails version 2.0 and greater - #self.view_paths << File.join(File.dirname(__FILE__), '..', 'views') - # For Rails versions less than 2.0 + # For Rails version >= 2.1 + # uncomment self.append_view_path File.join(File.dirname(__FILE__), '..', 'app', 'views') + # in lib/simple_cms.rb file + # For Rails version >= 2.0 and < 2.1 + #self.view_paths << File.join(File.dirname(__FILE__), '..', 'views') + # For Rails versions < 2.0 #self.template_root = File.join(File.dirname(__FILE__), '..', 'views') skip_before_filter :verify_authenticity_token app/controllers/simple_cms_media_controller.rb @@ -1,16 +1,44 @@ class SimpleCmsItem < ActiveRecord::Base acts_as_versioned - #def page_path - # h = YAML.load(params) - # h.delete("label") - # return h - # #return "/" + h["id"].join("/") - #end - def label h = YAML.load(params) - return h["label"] + h.each do |a| + return a[1] if a[0] == "label" + end + return nil + #return h["label"] end + def domain + h = YAML.load(params) + h.each do |a| + return a[1] if a[0] == "domain" + end + return nil + end + + def controller + h = YAML.load(params) + h.each do |a| + return a[1] if a[0] == "controller" + end + return nil + end + + def action + h = YAML.load(params) + h.each do |a| + return a[1] if a[0] == "action" + end + return nil + end + + def path + h = YAML.load(params) + h.each do |a| + return a[1].join("/") if a[0] == "path" + end + return nil + end end app/models/simple_cms_item.rb @@ -1,45 +1,9 @@ -<% %> +<% -%> <html> <head> <%= stylesheet_link_tag "simple_cms", "coderay" %> - <%= javascript_include_tag :defaults, "tiny_mce/tiny_mce", "simple_cms" %> - <script language="javascript" type="text/javascript"> - tinyMCE.init({ - mode : "textareas", - theme : "advanced", - plugins : "devkit,style,layer,table,save,advhr,emotions,ts_advimage,iespell,preview,advmedia,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,insertcode,dd", - theme_advanced_disable : "image", - theme_advanced_buttons1_add_before : "save,newdocument,|", - theme_advanced_buttons1_add : "fontselect,fontsizeselect", - theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,|", - theme_advanced_buttons2_add : "|,preview,|,print,|,fullscreen", - theme_advanced_buttons3_add_before : "tablecontrols,|", - theme_advanced_buttons3_add : "emotions,ts_image,advmedia,|,forecolor,backcolor", - theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,insertcode,|,dd_code", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "left", - theme_advanced_path_location : "bottom", - extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|style|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style],code_highlighting[type]", - file_browser_callback : "fileBrowserCallBack", - theme_advanced_resizing : true, - nonbreaking_force_tab : true, - apply_source_formatting : true, - template_replace_values : { - username : "Jack Black", - staffid : "991234" - }, - relative_urls : false, - remove_script_host : false - }); - - function fileBrowserCallBack(field_name, url, type, win) { - // This is where you insert your custom filebrowser logic - alert("Example of filebrowser callback: field_name: " + field_name + ", url: " + url + ", type: " + type + ", win: " + win); - - // Insert new URL, this would normaly be done in a popup - //win.document.forms[0].elements[field_name].value = "someurl.htm"; - } - </script> + <%= javascript_include_tag :defaults, "simple_cms" %> + <%= javascript_include_tag "tiny_mce/tiny_mce", "tiny_mce_init" %> </head> <body> <%= yield %> app/views/layouts/plugin.rhtml @@ -1,15 +1,17 @@ -<% %> +<% -%> <div class="simple_cms_item<%= "_admin" if @cms_admin %>" <%= "onmouseover=\"show_simple_cms_controls($(this))\"" if @cms_admin %> <%= "onmouseout=\"hide_simple_cms_controls($(this))\"" if @cms_admin %>> - <% if @cms_admin and simple_cms_item.data.blank? %> + <% if @cms_admin and simple_cms_item.data.blank? -%> <b style="cursor: pointer;" <%= "onclick=\"edit_simple_cms_item(#{simple_cms_item.id},'#{@prefix}')\"" %>>Click to add content here.</b> - <% else %> + <% else -%> <div class="controls"> - <% if @cms_admin %> + <% if @cms_admin -%> <b <%= "onclick=\"edit_simple_cms_item(#{simple_cms_item.id},'#{@prefix}')\"" %>>Edit</b> - <% end %> + <% end -%> </div> - <%= parse_coderay(simple_cms_item.data) %> - <% end %> + <% if !(simple_cms_item.data.nil? and !@cms_admin) -%> + <%= parse_coderay(simple_cms_item.data) %> + <% end -%> + <% end -%> </div> app/views/shared/_simple_cms_item.rhtml @@ -1,8 +1,23 @@ <% if @images.size > 0 %> <ul> <% @images.each_with_index do |image, i| %> - <li style="padding:0;margin:0list-style-type:none;display:inline;"> - <a href="#" onclick="ts_insert_image('<%= image.public_filename %>', 'ALT TEXT');"><%= @thumb_images[i] ? image_tag( @thumb_images[i].public_filename ) : image.filename + "<br />" %></a> + <li style="padding:0;margin:0;list-style-type:none;display:inline;"> + <a href="#" onclick="ts_insert_image('<%= image.public_filename %>', 'ALT TEXT');"> + <% if @thumb_images[i] -%> + <div class="image<%= "_ie" if request.env["HTTP_USER_AGENT"] =~ /MSIE/ %>" id="image_<%= image.id %>" onmouseover="show_image_controls($(this),<%= image.id %>)" onmouseout="hide_image_controls($(this),<%= image.id %>)"> + <%= image_tag( @thumb_images[i].public_filename, :align => "top" ) %></a> + <span id="controls_<%= image.id %>" class="controls"> + <%= link_to_remote( + image_tag("/javascripts/tiny_mce/plugins/ts_advimage/images/delete-icon_grey.jpg", + :width => "25", :height => "25", :alt => "delete", :title => "Delete Image"), + :url => { :action => 'destroy', :id => image.id }, + :html => { :class => "controls" }, + :confirm => "This will permanentally delete this image and everywhere you are linked to it will disapear.\n\nAre you sure you want to delete this image?" ) %> + </span> + </div> + <% else %> + <%= image.filename + "<br />" %></a> + <% end %> </li> <% end %> </ul> app/views/simple_cms_images/_show_image_list.rhtml @@ -7,8 +7,8 @@ </h3> <%= text_area :simple_cms_item, :data, {:class => "mceEditor"} %> <br/> - <%= submit_tag "Save Content" %> - <%= link_to "cancel", session["cms_referer"], - :confirm => "Are you sure you want to discard your changes?" %> + <%= submit_tag "Save Content", :style => "float:left;" %> + <%= button_to "Cancel", {}, :name => 'commit', :style => "float:left;", + :confirm => "Are you sure you want to discard your changes?" %> <br/> </div> app/views/simple_cms_items/_form.rhtml @@ -227,6 +227,17 @@ function insertMedia() { return false; } + if (f.media_type.options[f.media_type.selectedIndex].value == "file") { + h = '<a href="' + f.src.value + '"'; + h += ' target="_blank"'; + h += '>'; + h += f.link_text.value; + h += '</a>'; + tinyMCE.selectedInstance.execCommand('mceInsertContent', false, h); + tinyMCEPopup.close(); + return; + } + f.width.value = f.width.value == "" ? 100 : f.width.value; f.height.value = f.height.value == "" ? 100 : f.height.value; @@ -384,7 +395,18 @@ function changedType(t) { d.getElementById('shockwave_options').style.display = 'none'; d.getElementById('wmp_options').style.display = 'none'; d.getElementById('rmp_options').style.display = 'none'; - d.getElementById(t + '_options').style.display = 'block'; + d.getElementById('file_options').style.display = 'none'; + if (t == 'file') { + d.getElementById('dimensions').style.display = 'none'; + d.getElementById('prev').style.display = 'none'; + d.getElementById('advanced_tab').style.display = 'none'; + d.getElementById('file_options').style.display = ''; + } else { + d.getElementById('dimensions').style.display = ''; + d.getElementById('prev').style.display = ''; + d.getElementById('advanced_tab').style.display = ''; + d.getElementById(t + '_options').style.display = 'block'; + } } function serializeParameters() { @@ -600,6 +622,9 @@ function generatePreview(c) { codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701'; type = 'audio/x-pn-realaudio-plugin'; break; + + case "file": + break; } if (pl == '') { assets/javascripts/tiny_mce/plugins/advmedia/jscripts/media.js @@ -9,6 +9,7 @@ size_limit : '500 megabytes', file : 'File/URL', list : 'List', size : 'Dimensions', +link_text : 'Link Text', preview : 'Preview', constrain_proportions : 'Constrain proportions', type : 'Type', assets/javascripts/tiny_mce/plugins/advmedia/langs/en.js @@ -64,6 +64,7 @@ <option value="shockwave">Shockwave</option> <option value="wmp">Windows Media</option> <option value="rmp">Real Media</option> + <option value="file">Downloadable File</option> </select> </td> </tr> @@ -82,7 +83,7 @@ <td><label for="linklist">{$lang_advmedia_list}</label></td> <td id="linklistcontainer">&nbsp;</td> </tr> - <tr> + <tr id="dimensions"> <td><label for="width">{$lang_advmedia_size}</label></td> <td> <table border="0" cellpadding="0" cellspacing="0"> @@ -93,6 +94,10 @@ </tr> </table> </tr> + <tr id="file_options"> + <td><label for="link_text">{$lang_advmedia_link_text}</label></td> + <td><input type="text" id="link_text" name="link_text" value="" style="width: 230px;" /></td> + </tr> </table> </fieldset> assets/javascripts/tiny_mce/plugins/advmedia/media.htm @@ -62,7 +62,7 @@ var TinyMCE_InsertCodePlugin = { tinyMCE.switchClass(editor_id + '_insertcode', 'mceButtonNormal'); // Select insertcode button if parent node is a pre - if (tinyMCE.getParentElement(node, "pre", "class")) + if (tinyMCE.getParentElement(node, "code_highlighting")) tinyMCE.switchClass(editor_id + '_insertcode', 'mceButtonSelected'); return true; assets/javascripts/tiny_mce/plugins/insertcode/editor_plugin.js @@ -1,75 +1,104 @@ /* Import plugin specific language pack */ -tinyMCE.importPluginLanguagePack('insertcode', 'en,fr,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,fi,cy,es,is,pl'); +tinyMCE.importPluginLanguagePack('insertcode'); -/** - * Information about the plugin. - */ -function TinyMCE_insertcode_getInfo() { - return { - longname : 'insertcode plugin', - author : 'Maxime Lardenois', - authorurl : 'http://www.jpnp.org', - infourl : 'http://www.jpnp.org', - version : "1.0" - }; -}; +// InsertCode Plugin +var TinyMCE_InsertCodePlugin = { + /** + * Information about the plugin. + */ + getInfo : function () { + return { + longname : 'insertcode plugin', + author : 'Sean Naegle', + authorurl : '', + infourl : '', + version : "1.0" + }; + }, + + /** + * Gets executed when a editor needs to generate a button. + */ + getControlHTML : function (cn) { + switch (cn) { + case "insertcode": + return tinyMCE.getButtonHTML(cn, 'lang_insertcode_desc', '{$pluginurl}/images/insertcode.gif', 'mceInsertCode'); + } -/** - * Gets executed when a editor needs to generate a button. - */ -function TinyMCE_insertcode_getControlHTML(control_name) { - switch (control_name) { - case "insertcode": - var cmd = 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceinsertcode\', true);return false;'; - return '<a href="javascript:' + cmd + '" onclick="' + cmd + '" target="_self" onmousedown="return false;"><img id="{$editor_id}_insertcode" src="{$pluginurl}/images/insertcode.gif" title="{$lang_insertcode_desc}" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>'; - } + return ""; + }, - return ""; -} + /** + * Gets executed when a command is called. + */ + execCommand : function(editor_id, element, command, user_interface, value) { + // Handle commands + switch (command) { + // Remember to have the "mce" prefix for commands so they don't intersect with built in ones in the browser. + case "mceInsertCode": + // Open a popup window + tinyMCE.openWindow({ + file : '../../plugins/insertcode/insertcode.htm', + width : 550 + tinyMCE.getLang('lang_advmedia_delta_width', 0), + height : 500 + tinyMCE.getLang('lang_advmedia_delta_height', 0) + }, { + editor_id : editor_id, + resizable : "yes", + scrollbars : "no" + }); + + return true; + } -/** - * Gets executed when a command is called. - */ -function TinyMCE_insertcode_execCommand(editor_id, element, command, user_interface, value) { - // Handle commands - switch (command) { - // Remember to have the "mce" prefix for commands so they don't intersect with built in ones in the browser. - case "mceinsertcode": - // Show UI/Popup - if (user_interface) { - // Open a popup window - var insertcode = new Array(); + // Pass to next handler in chain + return false; + }, - insertcode['file'] = '../../plugins/insertcode/insertcode.htm'; // Relative to theme - insertcode['width'] = 550; - insertcode['height'] = 500; + /** + * Gets executed when the selection/cursor position was changed. + */ + handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) { + // Deselect insertcode button + tinyMCE.switchClass(editor_id + '_insertcode', 'mceButtonNormal'); - tinyMCE.openWindow(insertcode, {editor_id : editor_id, resizable : "yes", scrollbars : "no"}); + // Select insertcode button if parent node is a pre + if (tinyMCE.getParentElement(node, "code_highlighting")) + tinyMCE.switchClass(editor_id + '_insertcode', 'mceButtonSelected'); - // Let TinyMCE know that something was modified - tinyMCE.triggerNodeChange(false); - } else { - // Do a command this gets called from the insertcode popup - alert("execCommand: mceinsertcode gets called from popup."); - } + return true; + } - return true; - } + /* + handleEvent : function(e) { + var inst = tinyMCE.selectedInstance; + var w = inst.getWin(), le = inst._lastStyleElm, e; - // Pass to next handler in chain - return false; -} + if (tinyMCE.isGecko) { + e = inst.getFocusElement(); -/** - * Gets executed when the selection/cursor position was changed. - */ -function TinyMCE_insertcode_handleNodeChange(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) { - // Deselect insertcode button - tinyMCE.switchClassSticky(editor_id + '_insertcode', 'mceButtonNormal'); + if (e) { + if (!inst. + } + } + */ - // Select insertcode button if parent node is a pre - if (tinyMCE.getParentElement(node, "pre", "class")) - tinyMCE.switchClassSticky(editor_id + '_insertcode', 'mceButtonSelected'); + /** + * displays the outline box + handleVisualAid : function(el, deep, state, inst) { + var nl = inst.getDoc().getElementsByTagName("code_highlighting"), i; + alert("You are in the handleVisualAid() function"); + alert("nl: " + nl); + + for(i=0; i<nl.length; i++) { + if (new RegExp('absolute|relative|static', 'gi').test(nl[i].style.position)) { + if (state) + tinyMCE.addCSSClass(nl[i], 'mceVisualAid'); + else + tinyMCE.removeCSSClass(nl[i], 'mceVisualAid'); + } + } + } + */ +}; - return true; -} \ No newline at end of file +tinyMCE.addPlugin("insertcode", TinyMCE_InsertCodePlugin); assets/javascripts/tiny_mce/plugins/insertcode/editor_plugin_src.js @@ -22,8 +22,6 @@ <option value="xhtml">Nitro-XHTML</option> </select> </span><br/> - {$lang_insertcode_legend} :<br/> - <input type="text" name="codeLegend" size="90" style="width: 100%;"/> <br/> {$lang_insertcode_contents} : <br/> <textarea name="codeContent" cols="100" rows="15" style="width: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px;" dir="ltr" wrap="soft"> assets/javascripts/tiny_mce/plugins/insertcode/insertcode.htm @@ -4,29 +4,25 @@ function init() { tinyMCEPopup.resizeToInnerSize(); var editor_id = tinyMCE.getWindowArg('editor_id'); var inst = tinyMCE.getInstanceById(editor_id); - codeDiv = tinyMCE.getParentElement(inst.getFocusElement(), "CODE_HIGHLIGHTING", function(n) + /*codeDiv = tinyMCE.getParentElement(inst.getFocusElement(), "CODE_HIGHLIGHTING", function(n) { return n.parentNode && n.parentNode.tagName == "CODE_HIGHLIGHTING" && n.parentNode.className == "insert_code"; - }); - - //alert("codeDiv: " + codeDiv); + });*/ var focusElm = inst.getFocusElement(); - //alert("focusElm node type: " + focusElm.nodeType); - //alert("focusElm: " + focusElm.toSource()); - //alert("focusElm: " + focusElm.toString()); - //alert("focusElm: " + focusElm.valueOf()); - //alert("focusElm: " + String(focusElm)); - //alert("focusElm tag type: " + focusElm.tag); // If this has <code_highlighting tags already then // we are going to use that content if (focusElm.nodeName == "CODE_HIGHLIGHTING") { action = 'update'; - // Select all text - tinyMCE.execInstanceCommand(editor_id,'mceSelectNodeDepth',false,'0'); // Put text in editor + document.forms[0].codeType.value = focusElm.getAttributeNode('type').nodeValue + //alert("code: " + focusElm.textContent); document.forms[0].codeContent.value = focusElm.textContent; } else { + var selectedText = inst.selection.getSelectedText(); + selectedText = selectedText.replace(/\n\n/g,"\n"); + //alert("text: " + selectedText); + document.forms[0].codeContent.value = selectedText; action = 'insert'; } @@ -34,46 +30,28 @@ function init() { resizeInputs(); } -function insertText() { - var editor_id = tinyMCE.getWindowArg('editor_id'); - var inst = tinyMCE.getInstanceById(editor_id); - var focusElm = inst.getFocusElement(); - var selectedText = inst.selection.getSelectedHTML(); - - //alert("focusElm: " + focusElm); - //alert("focusElm node name: " + focusElm.nodeName); - //alert("focusElm node value: " + focusElm.nodeValue); - //alert("focusElm text content: " + focusElm.textContent); - //alert("selectedText: \n" + selectedText); -} - function insertCode() { - //alert("You are inside the insertCode() function"); var codeType = document.forms[0].codeType.options[document.forms[0].codeType.selectedIndex].value; - var codeLegend = document.forms[0].codeLegend.value; var code = document.forms[0].codeContent.value; - doInsertCode(codeType,codeLegend,code); + doInsertCode(codeType,code); } -function doInsertCode(codeType,codeLegend,code) { - //alert("You are inside the doInsertCode() function"); +function doInsertCode(codeType,code) { var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id')); + var codeDiv = inst.getFocusElement(); tinyMCEPopup.execCommand("mceBeginUndoLevel"); - //alert("action = " + action); if (action == "update") { - codeDiv.className = codeType; - codeDiv.innerHTML = ''; - codeDiv.innerHTML = code; + codeDiv.getAttributeNode('type').nodeValue = codeType + codeDiv.innerHTML = formatCode(code); + //alert("code: " + formatCode(code)); } else { code = formatCode(code); - //alert("code: \n" + code); - //fullCode = '<div class="insert_code_' + codeType + '">\n' + code + '\n</div>'; fullCode = '<code_highlighting type="' + codeType + '">\n' + code + '\n</code_highlighting>'; //alert("full code: \n" + fullCode); - tinyMCEPopup.execCommand("mceInsertContent", false, fullCode); + tinyMCE.selectedInstance.execCommand("mceInsertContent", false, fullCode); tinyMCE.handleVisualAid(inst.getBody(), true, inst.visualAid, inst); } @@ -93,11 +71,20 @@ function formatCode(code) { code = code.replace(/\t/g,"&nbsp;&nbsp;"); code = code.replace(/</g,"&lt;"); code = code.replace(/>/g,"&gt;"); - code = code.replace(/\n/g,"<br />"); + code = code.replace(/\n/g,"<br />\n"); return code; } +/*function formatHTML(html) { + html = html.replace(/<br>/g, "\n"); + html = html.replace(/&nbsp;/g, " "); + html = html.replace(/&lt;/g, "<"); + html = html.replace(/&gt;/g, ">"); + + return html; +}*/ + var wHeight=0, wWidth=0; function resizeInputs() { @@ -111,7 +98,6 @@ function resizeInputs() { document.forms[0].codeContent.style.height = Math.abs(wHeight) + 'px'; document.forms[0].codeContent.style.width = Math.abs(wWidth) + 'px'; - document.forms[0].codeLegend.style.width = Math.abs(wWidth) + 'px'; } function deleteHighlighting(withTags) { assets/javascripts/tiny_mce/plugins/insertcode/jscripts/insertcode.js @@ -1,3 +1,7 @@ +function formElement() { + return document.forms[0]; +} + function init() { tinyMCEPopup.resizeToInnerSize(); @@ -7,7 +11,7 @@ function init() { var inst = tinyMCE.selectedInstance; var tdElm = tinyMCE.getParentElement(inst.getFocusElement(), "td,th"); - var formObj = document.forms[0]; + var formObj = formElement(); var st = tinyMCE.parseStyle(tinyMCE.getAttrib(tdElm, "style")); // Get table cell data @@ -57,7 +61,7 @@ function updateAction() { var tdElm = tinyMCE.getParentElement(inst.getFocusElement(), "td,th"); var trElm = tinyMCE.getParentElement(inst.getFocusElement(), "tr"); var tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table"); - var formObj = document.forms[0]; + var formObj = formElement(); inst.execCommand('mceBeginUndoLevel'); @@ -125,7 +129,7 @@ function nextCell(elm) { function updateCell(td, skip_id) { var inst = tinyMCE.selectedInstance; - var formObj = document.forms[0]; + var formObj = formElement(); var curCellType = td.nodeName.toLowerCase(); var celltype = getSelectValue(formObj, 'celltype'); var doc = inst.getDoc(); @@ -185,7 +189,7 @@ function updateCell(td, skip_id) { } function changedBackgroundImage() { - var formObj = document.forms[0]; + var formObj = formElement(); var st = tinyMCE.parseStyle(formObj.style.value); st['background-image'] = "url('" + formObj.backgroundimage.value + "')"; @@ -194,7 +198,7 @@ function changedBackgroundImage() { } function changedSize() { - var formObj = document.forms[0]; + var formObj = formElement(); var st = tinyMCE.parseStyle(formObj.style.value); var width = formObj.width.value; @@ -213,7 +217,7 @@ function changedSize() { } function changedColor() { - var formObj = document.forms[0]; + var formObj = formElement(); var st = tinyMCE.parseStyle(formObj.style.value); st['background-color'] = formObj.bgcolor.value; @@ -223,7 +227,7 @@ function changedColor() { } function changedStyle() { - var formObj = document.forms[0]; + var formObj = formElement(); var st = tinyMCE.parseStyle(formObj.style.value); if (st['background-image']) assets/javascripts/tiny_mce/plugins/table/jscripts/cell.js @@ -1,3 +1,7 @@ +function formElement() { + return document.forms[0]; +} + function init() { tinyMCEPopup.resizeToInnerSize(); assets/javascripts/tiny_mce/plugins/table/jscripts/row.js @@ -1,5 +1,63 @@ /* CSS file for advimage plugin popup */ +div.image { + width: 60px; + height: 100px; + float: left; + margin-bottom: 1px; + margin-right: 5px; + border: 2px solid #fff; +} + +div.image img { + vertical-align: top; + margin: 0px; + margin-bottom: 1px; +} + +div.image_ie { + float: left; + display: inline; + width: 60px; + height: 100px; + margin-bottom: 1px; + border: 2px solid #fff; +} + +div.image_ie img { + vertical-align: top; + margin: 5px; + margin-bottom: 1px; +} + +span.controls { + display: none; + background-color: #A9A9A9; + width: 60px; + height: 30px; + margin-bottom: 1px; +} + +a.controls { + /*background-color: #A9A9A9;*/ + vertical-align: bottom; + /*float: right;*/ + margin-right: 5px; +} + +a.controls img { + border: 0px; + /*background-color: #A9A9A9;*/ + vertical-align: bottom; +} + +div.over_image { + float: left; + border: 2px solid gray; + background-color: #A9A9A9; + margin-right: 5px; +} + .mceImageList { width: 280px; } assets/javascripts/tiny_mce/plugins/ts_advimage/css/advimage.css @@ -572,6 +572,15 @@ function getImageListHTML(elm_id, target_form_element, onchange_func) { // tinyMCE.debug('-- image list start --', html, '-- image list end --'); } +function show_image_controls(obj,id) { + obj.addClassName('over_image'); + $('controls_'+id).style.display = "inline"; +} + +function hide_image_controls(obj,id) { + obj.removeClassName('over_image'); + $('controls_'+id).style.display = ""; +} // While loading preinit(); assets/javascripts/tiny_mce/plugins/ts_advimage/jscripts/functions.js @@ -4092,6 +4092,12 @@ tinyMCE.add(TinyMCE_Engine, { // Close tags <img></img> to <img/> s = s.replace(new RegExp('<(img|br|hr)([^>]*)><\\/(img|br|hr)>', 'gi'), '<$1$2 />'); + // Remove open closed tags with nothing inside them + //s = s.replace(new RegExp('<(h[1-6]|font|strong|a|b|u|i|table|em|ul|ol|blockquote|code_highlighting).*>(\\s|&nbsp;|)*</(h[1-6]|font|strong|a|b|u|i|table|em|ul|ol|blockquote|code_highlighting)>', 'gi'), ''); + + // Fix split up code_highlighting tags + s = s.replace(new RegExp('</code_highlighting>\\s</p>\\s<p>\\s<code_highlighting\\stype="[a-z]*">', 'gi'), '<br />\n'); + // Weird MSIE bug, <p><hr /></p> breaks runtime? if (tinyMCE.isIE) s = s.replace(new RegExp('<p><hr \\/><\\/p>', 'gi'), "<hr>"); assets/javascripts/tiny_mce/tiny_mce.js @@ -1436,8 +1436,6 @@ TinyMCE_Engine.prototype = { getButtonHTML : function(id, lang, img, cmd, ui, val) { var h = '', m, x, io = ''; - alert("this is: " + img); - cmd = 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + cmd + '\''; if (typeof(ui) != "undefined" && ui != null) @@ -1856,6 +1854,7 @@ TinyMCE_Engine.prototype = { if (this.plugins[name]) b = this.plugins[name].baseURL; + //alert("import plugin: " + b + '/langs/' + tinyMCE.settings.language + '.js'); tinyMCE.loadScript(b + '/langs/' + tinyMCE.settings.language + '.js'); }, @@ -4093,6 +4092,12 @@ tinyMCE.add(TinyMCE_Engine, { // Close tags <img></img> to <img/> s = s.replace(new RegExp('<(img|br|hr)([^>]*)><\\/(img|br|hr)>', 'gi'), '<$1$2 />'); + // Remove open closed tags with nothing inside them + //s = s.replace(new RegExp('<(h[1-6]|font|strong|a|b|u|i|table|em|ul|ol|blockquote|code_highlighting).*>(\\s|&nbsp;|)*</(h[1-6]|font|strong|a|b|u|i|table|em|ul|ol|blockquote|code_highlighting)>', 'gi'), ''); + + // Fix split up code_highlighting tags + s = s.replace(new RegExp('</code_highlighting>\\s</p>\\s<p>\\s<code_highlighting\\stype="[a-z]*">', 'gi'), '<br />\n'); + // Weird MSIE bug, <p><hr /></p> breaks runtime? if (tinyMCE.isIE) s = s.replace(new RegExp('<p><hr \\/><\\/p>', 'gi'), "<hr>"); assets/javascripts/tiny_mce/tiny_mce_src.js @@ -1,11 +1,32 @@ # Include hook code here +#require 'application' require 'simple_cms' +ActionView::Base.send :include, SimpleCmsMod::Render + +ApplicationController.send :include, SimpleCmsMod::ViewPaths + model_path = File.join(directory, 'app', 'models') $LOAD_PATH << model_path -Dependencies.load_paths << model_path + +# Use Dependencies.load_paths for any version <= 2.1.0 +# Use ActiveSupport::Dependencies.load_paths for any version >= 2.1.1 +# If you are using a version <= 2.1.0 and it is not in the list then add it +if %w(1.2.0 1.2.1 1.2.3 1.2.4 1.2.5 1.2.6 2.0.0 2.0.1 2.0.2 2.1.0).include?(RAILS_GEM_VERSION) + Dependencies.load_paths << model_path +else + ActiveSupport::Dependencies.load_paths << model_path +end controller_path = File.join(directory, 'app', 'controllers') $LOAD_PATH << controller_path -Dependencies.load_paths << controller_path + +# Use Dependencies.load_paths for any version <= 2.1.0 +# Use ActiveSupport::Dependencies.load_paths for any version >= 2.1.1 +# If you are using a version <= 2.1.0 and it is not in the list then add it +if %w(1.2.0 1.2.1 1.2.3 1.2.4 1.2.5 1.2.6 2.0.0 2.0.1 2.0.2 2.1.0).include?(RAILS_GEM_VERSION) + Dependencies.load_paths << controller_path +else + ActiveSupport::Dependencies.load_paths << controller_path +end config.controller_paths << controller_path init.rb @@ -1,7 +1,8 @@ # Install hook code here require 'ftools' +puts IO.read(File.join(File.dirname(__FILE__), 'README')) +puts "\n\n======================================================" puts "\n\nMoving all required javascript and css files to your public directory..." `rake simple_cms:install` puts "\n\nsimple_cms requires 4 dependencies...attachment_fu, responds_to_parent, acts_as_versioned, and coderay. To install them use: \n'rake simple_cms:install_dependencies'\n\n" -puts IO.read(File.join(File.dirname(__FILE__), 'README')) install.rb @@ -1,78 +1,3 @@ -# SimpleCMS -ActionView::Base.class_eval do - alias_method :render_otherwise, :render - - def render(options = {}, old_local_assigns = {}, &block) #:nodoc: - if options.is_a?(Hash) && options[:simpleCMS] - render_simple_cms(options) - else - render_otherwise(options, old_local_assigns, &block) - end - end - - def render_simple_cms(options = {}) - @label = (options[:simpleCMS].blank?)? "defaultLabel" : options[:simpleCMS] - @domain = controller.request.env["HTTP_X_FORWARDED_HOST"] if controller.request.env["HTTP_X_FORWARDED_HOST"] - @reusable = options[:reusable] || false - if @reusable - @cms_params = {:label => @label, :domain => @domain}.to_yaml.gsub(/\r/,"") - else - @cms_params = controller.params. - merge(:label => @label, :domain => @domain). - to_yaml.gsub(/\r/,"") - end - @cms_admin = options[:admin] || false - @cms_user = options[:user] || "N/A" - @prefix = options[:prefix] || "" - - session["cms_admin"] ||= {} - session["cms_admin"][@cms_params] = @cms_admin - session["cms_user"] ||= {} - session["cms_user"][@cms_params] = @cms_user - session["cms_prefix"] ||= {} - session["cms_prefix"][@cms_params] = @prefix - #session["cms_referer"] = controller.request.env["REQUEST_PATH"].gsub(/\/sites.*skizmo.com/,"") - #session["cms_referer"] = "/" if session["cms_referer"].blank? - request_path = controller.request.env["REQUEST_PATH"] || controller.request.env["REQUEST_URI"] || controller.request.env["SCRIPT_NAME"] - session["cms_referer"] = request_path.nil? ? "/" : request_path.gsub(/\/sites.*skizmo.com/,"") - - - # link to add new data - # display current data if any - item = SimpleCmsItem.find_by_params(@cms_params) - if !item - item = SimpleCmsItem.create(:params => @cms_params, :created_by => @cms_user, :updated_by => @cms_user) - end - render :partial => shared_path("simple_cms_item"), - :object => item - end - - def cms_shared_path(partial_path) - shared_path(partial_path) - end - -private - - # Path to CMS Files that the end user will experience - # 1 partial for adding content - # 1 partial for viewing/editing content - def shared_path(partial_path) - return "shared/#{partial_path}" - end - - def parse_coderay(text) - text.scan(/(<code_highlighting type=\"([a-z].+?)\">(.+?)<\/code_highlighting>)/m).each do |match| - logger.error("\ncode: " + match[2]) - match[2] = match[2].gsub("<br />", ""). - gsub("&nbsp;", " "). - gsub("&lt;", "<"). - gsub("&gt;", ">"). - gsub("&quot;", "\"") - match[2] = match[2] + "\n" - logger.error("\nnew code: " + match[2]) - text.gsub!(match[0],CodeRay.scan(match[2], match[1].to_sym).div( :line_numbers => :table, :css => :class)) - end - return text - end - -end +# SimpleCms +require 'view_paths' +require 'render' lib/simple_cms.rb @@ -5,24 +5,32 @@ namespace :simple_cms do desc 'Installs required javascript and css files to the public/javascripts and public/stylesheets directories' task :install do - puts "COPYING *.js:" - FileUtils.cp Dir[PLUGIN_ROOT + '/assets/javascripts/*.js'], RAILS_ROOT + '/public/javascripts' + FileList[PLUGIN_ROOT + '/assets/javascripts/*.js'].each do |f| + puts "ADDING /public/javascripts/" + File.basename(f) + FileUtils.cp f, RAILS_ROOT + '/public/javascripts' + end + FileList[PLUGIN_ROOT + '/assets/stylesheets/*.css'].each do |f| + puts "ADDING /public/stylesheets/" + File.basename(f) + FileUtils.cp f, RAILS_ROOT + '/public/stylesheets' + end + puts "COPYING tiny_mce:" FileUtils.cp_r Dir[PLUGIN_ROOT + '/assets/javascripts/tiny_mce'], RAILS_ROOT + '/public/javascripts' - puts "COPYING *.css:" - FileUtils.cp Dir[PLUGIN_ROOT + '/assets/stylesheets/*.css'], RAILS_ROOT + '/public/stylesheets' end desc 'Uninstalls all javascript and css files that were created by the simple_cms:install' task :uninstall do - puts "REMOVING /public/javascripts/tiny_mce:" + puts "REMOVING /assets/javascripts/tiny_mce:" FileUtils.rm_rf RAILS_ROOT + '/public/javascripts/tiny_mce' - puts "REMOVING /public/javascripts/simple_cms.js" - FileUtils.rm RAILS_ROOT + '/public/javascripts/simple_cms.js' - puts "REMOVING /public/stylesheets/simple_cms.css" - FileUtils.rm RAILS_ROOT + '/public/stylesheets/simple_cms.css' - puts "REMOVING /public/stylesheets/coderay.css" - FileUtils.rm RAILS_ROOT + '/public/stylesheets/coderay.css' + + FileList[PLUGIN_ROOT + '/assets/javascripts/*.js'].each do |file| + puts "REMOVING /public/javascripts/" + File.basename(file) + FileUtils.rm RAILS_ROOT + '/public/javascripts/' + File.basename(file) + end + FileList[PLUGIN_ROOT + '/assets/stylesheets/*.css'].each do |file| + puts "REMOVING /public/stylesheets/" + File.basename(file) + FileUtils.rm RAILS_ROOT + '/public/stylesheets/' + File.basename(file) + end end desc 'Installs simple_cms dependencies(attachment_fu, responds_to_parent, acts_as_versioned, and coderay)' @@ -32,7 +40,7 @@ namespace :simple_cms do puts "Installing plugin responds_to_parent..." puts `ruby script/plugin install http://svn.pullmonkey.com/plugins/trunk/responds_to_parent/` puts "Installing plugin acts_as_versioned..." - puts `ruby script/plugin install http://svn.pullmonkey.com/plugins/trunk/acts_as_versioned/` + puts `ruby script/plugin install http://svn.pullmonkey.com/plugins/trunk/acts_as_versioned_2.1.1/` puts "Installing plugin coderay..." puts `ruby script/plugin install http://svn.pullmonkey.com/plugins/trunk/coderay/` end tasks/simple_cms_tasks.rake assets/javascripts/tiny_mce/plugins/dd/css/dd.css assets/javascripts/tiny_mce/plugins/dd/editor_plugin.js assets/javascripts/tiny_mce/plugins/dd/editor_plugin_src.js assets/javascripts/tiny_mce/plugins/dd/images/dd_code.gif assets/javascripts/tiny_mce/plugins/dd/install%20-%20readme.txt assets/javascripts/tiny_mce/plugins/dd/langs/en.js 9067ae83d3d187b2f3870bccbc188ea56093b806 scnaegle scnaegl@sahp5507.sandia.gov http://github.com/pullmonkey/simple_cms/commit/b2355525f1913e2c31137da1d6be93e06e6e6d96 b2355525f1913e2c31137da1d6be93e06e6e6d96 2009-04-15T11:06:30-07:00 2009-04-15T11:06:30-07:00 updated to newest pull from subversion a79db87158cf01d4803a66743102309f0f3d21bb scnaegle scnaegl@sahp5507.sandia.gov