beef-admin_area 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/beef-admin_area.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-admin_area}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-11-19}
+  s.date = %q{2010-01-26}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -149,6 +149,7 @@ Gem::Specification.new do |s|
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/js/anchor.js",
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/js/color_picker.js",
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/js/link.js",
+     "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/js/source_editor.js",
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/langs/en.js",
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/langs/en_dlg.js",
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/link.htm",
@@ -161,6 +162,7 @@ Gem::Specification.new do |s|
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/skins/default/img/progress.gif",
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/skins/default/img/tabs.gif",
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/skins/default/ui.css",
+     "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/source_editor.htm",
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/tiny_mce.js",
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/tiny_mce_popup.js",
      "generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/utils/form_utils.js",

data/generators/admin_area_files/admin_area_files_generator.rb

@@ -1,18 +1,18 @@
 require File.expand_path(File.dirname(__FILE__) + "/lib/insert_commands.rb")
 
 class AdminAreaFilesGenerator < Rails::Generator::Base
-  
+
   def manifest
     record do |m|
-      
+
       m.insert_into 'app/models/user.rb', <<-RUBY
 # List of allowed roles. Removing admin role will cause errors
   ROLES = [:team_member, :admin]
   include Beef::AdminArea::Roles
-  
+
   attr_accessible :name
   validates_presence_of :name
-  
+
 private
   before_save :set_permalink
 
@@ -20,8 +20,8 @@ private
     self.permalink = name.parameterize
   end
 RUBY
-      
-      
+
+
       m.directory File.join("public", "images", "admin")
       m.directory File.join("public", "images", "textile-editor")
       m.directory File.join("public", "images", "lightwindow")
@@ -52,6 +52,9 @@ RUBY
       m.directory File.join("public", "javascripts", "admin", "tiny_mce", "plugins", "inlinepopups", "skins", "clearlooks2")
       m.directory File.join("public", "javascripts", "admin", "tiny_mce", "plugins", "inlinepopups", "skins", "clearlooks2", "img")
       m.directory File.join("public", "javascripts", "admin", "tiny_mce", "plugins", "safari")
+      m.directory File.join("public", "javascripts", "admin", "tiny_mce", "plugins", "paste")
+      m.directory File.join("public", "javascripts", "admin", "tiny_mce", "plugins", "paste", "js")
+      m.directory File.join("public", "javascripts", "admin", "tiny_mce", "plugins", "paste", "langs")
 
 
 
@@ -150,6 +153,7 @@ RUBY
       "public/javascripts/admin/tiny_mce/langs/en.js",
       "public/javascripts/admin/tiny_mce/themes/advanced/anchor.htm",
       "public/javascripts/admin/tiny_mce/themes/advanced/link.htm",
+      "public/javascripts/admin/tiny_mce/themes/advanced/source_editor.htm",
       "public/javascripts/admin/tiny_mce/themes/advanced/skins/default/content.css",
       "public/javascripts/admin/tiny_mce/themes/advanced/skins/default/ui.css",
       "public/javascripts/admin/tiny_mce/themes/advanced/skins/default/img/tabs.gif",
@@ -167,6 +171,7 @@ RUBY
       "public/javascripts/admin/tiny_mce/themes/advanced/js/link.js",
       "public/javascripts/admin/tiny_mce/themes/advanced/js/color_picker.js",
       "public/javascripts/admin/tiny_mce/themes/advanced/js/anchor.js",
+      "public/javascripts/admin/tiny_mce/themes/advanced/js/source_editor.js",
       "public/javascripts/admin/tiny_mce/themes/advanced/color_picker.htm",
       "public/javascripts/admin/tiny_mce/plugins/template/blank.htm",
       "public/javascripts/admin/tiny_mce/plugins/template/css/template.css",
@@ -181,6 +186,12 @@ RUBY
       "public/javascripts/admin/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif",
       "public/javascripts/admin/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif",
       "public/javascripts/admin/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif",
+      "public/javascripts/admin/tiny_mce/plugins/paste/editor_plugin.js",
+      "public/javascripts/admin/tiny_mce/plugins/paste/js/pastetext.js",
+      "public/javascripts/admin/tiny_mce/plugins/paste/js/pasteword.js",
+      "public/javascripts/admin/tiny_mce/plugins/paste/langs/en_dlg.js",
+      "public/javascripts/admin/tiny_mce/plugins/paste/pastetext.htm",
+      "public/javascripts/admin/tiny_mce/plugins/paste/pasteword.htm",
       "public/javascripts/admin/tiny_mce/plugins/inlinepopups/template.htm",
       "public/javascripts/admin/tiny_mce/plugins/safari/blank.htm",
       "public/javascripts/admin/tiny_mce/plugins/safari/editor_plugin.js",
@@ -189,9 +200,9 @@ RUBY
       ].each do |file|
          m.file file, file
        end
-       
+
        m.migration_template 'migration.rb', 'db/migrate', :migration_file_name => 'create_settings_and_users'
-       
+
     end
   end
 end

data/generators/admin_area_files/templates/app/views/admin/settings/show.html.erb

@@ -23,7 +23,7 @@
   </fieldset>
 
   <fieldset id="flickrsettings"><legend>Flickr Settings</legend>
-  <%= setting_form :flickr_user_id %>
+  <%= setting_form 'flickr_user_id' %>
   </fieldset>
   
   

data/generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/js/source_editor.js

@@ -0,0 +1,62 @@
+tinyMCEPopup.requireLangPack();
+tinyMCEPopup.onInit.add(onLoadInit);
+
+function saveContent() {
+	tinyMCEPopup.editor.setContent(document.getElementById('htmlSource').value, {source_view : true});
+	tinyMCEPopup.close();
+}
+
+function onLoadInit() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	// Remove Gecko spellchecking
+	if (tinymce.isGecko)
+		document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck");
+
+	document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent({source_view : true});
+
+	if (tinyMCEPopup.editor.getParam("theme_advanced_source_editor_wrap", true)) {
+		setWrap('soft');
+		document.getElementById('wraped').checked = true;
+	}
+
+	resizeInputs();
+}
+
+function setWrap(val) {
+	var v, n, s = document.getElementById('htmlSource');
+
+	s.wrap = val;
+
+	if (!tinymce.isIE) {
+		v = s.value;
+		n = s.cloneNode(false);
+		n.setAttribute("wrap", val);
+		s.parentNode.replaceChild(n, s);
+		n.value = v;
+	}
+}
+
+function toggleWordWrap(elm) {
+	if (elm.checked)
+		setWrap('soft');
+	else
+		setWrap('off');
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function resizeInputs() {
+	var el = document.getElementById('htmlSource');
+
+	if (!tinymce.isIE) {
+		 wHeight = self.innerHeight - 65;
+		 wWidth = self.innerWidth - 16;
+	} else {
+		 wHeight = document.body.clientHeight - 70;
+		 wWidth = document.body.clientWidth - 16;
+	}
+
+	el.style.height = Math.abs(wHeight) + 'px';
+	el.style.width  = Math.abs(wWidth) + 'px';
+}

data/generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/source_editor.htm

@@ -0,0 +1,31 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>{#advanced_dlg.code_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js?v={tinymce_version}"></script>
+	<script type="text/javascript" src="js/source_editor.js?v={tinymce_version}"></script>
+</head>
+<body onresize="resizeInputs();" style="display:none; overflow:hidden;">
+	<form name="source" onsubmit="saveContent();return false;" action="#">
+		<div style="float: left" class="title">{#advanced_dlg.code_title}</div>
+
+		<div id="wrapline" style="float: right">
+			<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{#advanced_dlg.code_wordwrap}</label>
+		</div>
+
+		<br style="clear: both" />
+
+		<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,monospace; font-size: 12px;" dir="ltr" wrap="off" class="mceFocus"></textarea>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="submit" name="insert" value="{#update}" id="insert" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>

data/generators/admin_area_files/templates/public/javascripts/tiny-mce-config.js

@@ -5,11 +5,11 @@ document.observe("dom:loaded", function(){
     editor_selector : "editor",
     strict_loading_mode : 1,
     convert_urls : false,
-    plugins : "safari,inlinepopups",
+    plugins : "safari,inlinepopups,paste",
     //"safari,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras",
     // Theme options
     theme_advanced_blockformats : "h2,h3,h4",
-    theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,formatselect,|,bullist,numlist,|,link,unlink,|,indent,outdent,|,justifyleft,justifycenter,justifyright,justifyfull",
+    theme_advanced_buttons1 :  "undo,redo,|,bold,italic,underline,strikethrough,|,formatselect,|,bullist,numlist,|,link,unlink,|,indent,outdent,|,justifyleft,justifycenter,justifyright,justifyfull,|,code",
     theme_advanced_buttons2 : "",
     theme_advanced_buttons3 : "",
     theme_advanced_buttons4 : "",
@@ -19,6 +19,10 @@ document.observe("dom:loaded", function(){
     theme_advanced_statusbar_location : "bottom",
     theme_advanced_resizing : true,
     
+    // Paste
+    paste_auto_cleanup_on_paste : true,
+    paste_remove_styles: true,
+    
     // Drop lists for link/image/media/template dialogs
     external_link_list_url : false,
     remove_redundant_brs : false,
@@ -28,28 +32,18 @@ document.observe("dom:loaded", function(){
 
 saveEditorToElement = function(inst){
   inst.save();
-}
-
-
-
+};
 
 // Add image. insertAtCursor function in apllcation.js
 addImage = function(imageurl,alt) {
-//  alt = alt.replace("(","").replace(")","");
-//  insertAtCursor(tinyMCE.activeEditor.getContainer(), '\n\n!'+imageurl+'('+alt+')!\n\n');
   tinyMCE.execInstanceCommand(tinyMCE.activeEditor.id,"mceInsertContent",false, '<img src="' + imageurl + '" alt="' + alt + '" />');
 };
 
 addLinkedImage = function(imageurl,alt) {
-//  alt = alt.replace("(","").replace(")","");
-//  insertAtCursor(tinyMCE.activeEditor.getContainer(), '\n\n!'+imageurl+'('+alt+')!:'+imageurl+'\n\n');
-
    tinyMCE.execInstanceCommand(tinyMCE.activeEditor.id,"mceInsertContent",false, '<a href="' + imageurl + '"><img src="' + imageurl + '" alt="' + alt + '" /></a>');
 };
 
 addLink = function(text, url) {
-  //insertAtCursor(tinyMCE.activeEditor.getContainer(), '"'+ text +'":'+ url + ' ');
-  
   tinyMCE.execInstanceCommand(tinyMCE.activeEditor.id,"mceInsertContent",false,'<a href="' + url + '">' + text + '</a>');
 };
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-admin_area
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 +00:00
+date: 2010-01-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -185,6 +185,7 @@ files:
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/js/anchor.js
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/js/color_picker.js
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/js/link.js
+- generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/js/source_editor.js
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/langs/en.js
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/langs/en_dlg.js
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/link.htm
@@ -197,6 +198,7 @@ files:
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/skins/default/img/progress.gif
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/skins/default/img/tabs.gif
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/skins/default/ui.css
+- generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/themes/advanced/source_editor.htm
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/tiny_mce.js
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/tiny_mce_popup.js
 - generators/admin_area_files/templates/public/javascripts/admin/tiny_mce/utils/form_utils.js