annex-cms 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6e99557efcf942a2d1e2993a42d288c10d5f70e
-  data.tar.gz: fdb657ef298344717b582d6858aff52a988bba1e
+  metadata.gz: 66347c32dd4e2bed09cb669abdcf34bf935f18ac
+  data.tar.gz: bfba86f133130ee266ed7c7d9258cc98a3c802b8
 SHA512:
-  metadata.gz: 7f6d96d74a720c70b6cd568bd64f7a5e759ecd0e6c46bb347a97bc9476b20cf1aceabf495942ec4624a5dbb9d52105e8f0c7cdf98b22e3b7e8e385ac67fa6c58
-  data.tar.gz: dfd6b4190c0bb2ece912a39af1e4cfc2a49d6a981ef9d8905665477770bbfb0e52000993c10ead80aca4215925024e39703261771da1465fc938c374ad7a4dc5
+  metadata.gz: d4ad383990c1b6ca0a1b87e92ff94f08512c828f91632f93f7c69ebcf5d0146733735011dd40b53075bc4a3b07e6fd6ee2a76bb38428b040a878c9a1e85fb73e
+  data.tar.gz: d5d98e38fa300f82935dc8a5c5a314fbed0b5c87a8400491fc2f5f065e459cd4e14063a179bef0f316740f500ebf09815879f97effd4e15fdbbc3f75d1266c83

data/app/assets/javascripts/annex/cms.js.coffee

@@ -11,10 +11,7 @@ ready = ->
     unless $(this).hasClass("redactor-editor")
       $(this).redactor
         focus: true
-        imageUpload: '/annex/upload'
-        imageManagerJson: '/annex/upload/images.json'
-        fileUpload: '/annex/upload'
-        fileManagerJson: '/annex/upload/files.json'
+        buttonSource: true
         plugins: [
           "definedlinks"
           "fontsize"
@@ -28,19 +25,48 @@ ready = ->
           "save"
         ]
         toolbarFixed: false
-        deniedTags: ['html', 'head', 'body', 'applet']
+        formatting: ['p', 'blockquote', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']
+        formattingAdd: [
+          {
+            tag: 'pre'
+            title: 'pre'
+          }
+          {
+            tag: 'code'
+            title: 'code'
+          }
+        ]
 
     return
 
   # on page load, look for texarea.redactor because those will always be CMS mode
   $("textarea.redactor").redactor
     focus: true
+    buttonSource: true
     plugins: [
+      "definedlinks"
+      "fontsize"
+      "fontcolor"
+      "table"
+      "filemanager"
+      "imagemanager"
+      "video"
       "clips"
       "fullscreen"
       "save"
     ]
-    toolbarFixed: false
+    toolbarFixed: true
+    formatting: ['p', 'blockquote', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']
+    formattingAdd: [
+      {
+        tag: 'pre'
+        title: 'pre'
+      }
+      {
+        tag: 'code'
+        title: 'code'
+      }
+    ]
 
   return
 

data/app/assets/javascripts/annex.js.coffee

@@ -1,4 +1,3 @@
-//= require annex/cms
 //= require annex/jquery.redactor
 //= require annex/jquery.redactor.definedlinks
 //= require annex/jquery.redactor.fontsize

data/app/assets/stylesheets/annex/redactor.css.scss

@@ -747,185 +747,17 @@ body .redactor-box-fullscreen {
   font-family: monospace, sans-serif;
 }
 .redactor-dropdown .redactor-formatting-h1 {
-  font-size: 36px;
-  line-height: 36px;
   font-weight: bold;
 }
 .redactor-dropdown .redactor-formatting-h2 {
-  font-size: 24px;
-  line-height: 36px;
   font-weight: bold;
 }
 .redactor-dropdown .redactor-formatting-h3 {
-  font-size: 21px;
-  line-height: 30px;
   font-weight: bold;
 }
 .redactor-dropdown .redactor-formatting-h4 {
-  font-size: 18px;
-  line-height: 26px;
   font-weight: bold;
 }
 .redactor-dropdown .redactor-formatting-h5 {
-  font-size: 16px;
-  line-height: 23px;
   font-weight: bold;
 }
-/*
-	##############################################
-
-	 CONTENT STYLES
-
-	##############################################
-*/
-.redactor-editor code,
-.redactor-editor pre {
-  font-family: Menlo, Monaco, monospace, sans-serif;
-}
-.redactor-editor div,
-.redactor-editor p,
-.redactor-editor ul,
-.redactor-editor ol,
-.redactor-editor table,
-.redactor-editor dl,
-.redactor-editor blockquote,
-.redactor-editor pre {
-  font-size: 14px;
-  line-height: 1.6em;
-}
-.redactor-editor a {
-  color: #15c;
-  text-decoration: underline;
-}
-.redactor-editor object,
-.redactor-editor embed,
-.redactor-editor video,
-.redactor-editor img {
-  max-width: 100%;
-  width: auto;
-}
-.redactor-editor video,
-.redactor-editor img {
-  height: auto;
-}
-.redactor-editor div,
-.redactor-editor p,
-.redactor-editor ul,
-.redactor-editor ol,
-.redactor-editor table,
-.redactor-editor dl,
-.redactor-editor figure,
-.redactor-editor blockquote,
-.redactor-editor pre {
-  margin: 0;
-  margin-bottom: 15px;
-  border: none;
-  background: none;
-  box-shadow: none;
-}
-.redactor-editor iframe,
-.redactor-editor object,
-.redactor-editor hr {
-  margin-bottom: 15px;
-}
-.redactor-editor iframe {
-  width: auto;
-}
-.redactor-editor blockquote {
-  margin-left: 1.6em !important;
-  padding-left: 0;
-  color: #777;
-  font-style: italic;
-}
-.redactor-editor ul,
-.redactor-editor ol {
-  padding-left: 2em;
-}
-.redactor-editor ul ul,
-.redactor-editor ol ol,
-.redactor-editor ul ol,
-.redactor-editor ol ul {
-  margin: 2px;
-  padding: 0;
-  padding-left: 2em;
-  border: none;
-}
-.redactor-editor dl dt {
-  font-weight: bold;
-}
-.redactor-editor dd {
-  margin-left: 1em;
-}
-.redactor-editor table {
-  border-collapse: collapse;
-  font-size: 1em;
-  width: 100%;
-}
-.redactor-editor table td,
-.redactor-editor table th {
-  padding: 5px;
-  border: 1px solid #ddd;
-  vertical-align: top;
-}
-.redactor-editor table thead td,
-.redactor-editor table th {
-  font-weight: bold;
-  border-bottom-color: #888;
-}
-.redactor-editor code {
-  background-color: #d8d7d7;
-}
-.redactor-editor pre {
-  overflow: auto;
-  padding: 1em;
-  border: 1px solid #ddd;
-  border-radius: 3px;
-  background: #f8f8f8;
-  white-space: pre;
-  font-size: 90%;
-}
-.redactor-editor hr {
-  display: block;
-  height: 1px;
-  border: 0;
-  border-top: 1px solid #ccc;
-}
-.redactor-editor h1,
-.redactor-editor h2,
-.redactor-editor h3,
-.redactor-editor h4,
-.redactor-editor h5,
-.redactor-editor h6 {
-  font-weight: bold;
-  color: #0000;
-  padding: 0;
-  background: none;
-  text-rendering: optimizeLegibility;
-  margin: 0 0 .5em 0;
-}
-.redactor-editor h1,
-.redactor-editor h2,
-.redactor-editor h3,
-.redactor-editor h4 {
-  line-height: 1.3;
-}
-.redactor-editor h1 {
-  font-size: 36px;
-}
-.redactor-editor h2 {
-  font-size: 24px;
-  margin-bottom: .7em;
-}
-.redactor-editor h3 {
-  font-size: 21px;
-}
-.redactor-editor h4 {
-  font-size: 18px;
-}
-.redactor-editor h5 {
-  font-size: 16px;
-}
-.redactor-editor h6 {
-  font-size: 12px;
-  text-transform: uppercase;
-}

data/lib/annex/version.rb

@@ -2,5 +2,5 @@
 # Annex
 #
 module Annex
-  VERSION = '0.3.2'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: annex-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Clay McIlrath