phcpress 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d04bf361b222a9d32f8e4b2e5fe0fd97d159d50
-  data.tar.gz: 06a8c08d9edd60dd09d971b179e7f669c8f0df02
+  metadata.gz: 9d1f09299dfd8661ca9fd26bbcc0e2f0945e5aa6
+  data.tar.gz: bf72eb5eab5f83786d0d7675e6b5419597dbcba4
 SHA512:
-  metadata.gz: a992ee118f81c11082f216ad6d9cffe558eed417bf8fbd5f8717f9f201196e38e828f7c549165f76bb49a2fe569385d54d85c8ec71c0830abec7c303c415abc8
-  data.tar.gz: b116d78dbdabdbe8973f05e8f7dfe32527a13d4be9e76ff0617f4997617125fc84ab345ba262b20b399116960134ee9d9ff4e7baec00e5667bfb2db4bd857a70
+  metadata.gz: 04285dde04190a8a176fb4a5cce7e6ebad436111f48739fc03353da6b1ba08bd1a8ae382cb87996ebf6a4273b5767a54d86924968a264a8231e0a0dd40146bf8
+  data.tar.gz: 3bfd25c5e48f6b0657d5a7f26171528202af1e67fac1340dce8a7e4dce366c16271e6a562c1a77789b33c039a954ab7ff23bb86f679614bd6ddb5de411674129

data/README.md

@@ -8,7 +8,7 @@ PHCPress is a basic open source news & blog engine.
   
 #### Step 1 - Add PHCPress Engine to your gemfile  
 
-	gem 'phcpress', '~> 4.0'
+	gem 'phcpress', '~> 5.1'
 	bundle exec install
   
 #### Step 2 - Copy over database migration files  

data/app/assets/javascripts/phcpress/application.js

@@ -13,4 +13,22 @@
 //= require jquery
 //= require jquery_ujs
 //= require bootstrap-sprockets
-//= require_tree .
+//= require codemirror
+//= require codemirror/modes/ruby
+//= require codemirror/modes/sass
+//= require codemirror/modes/shell
+//= require codemirror/modes/sql
+//= require codemirror/modes/slim
+//= require codemirror/modes/nginx
+//= require codemirror/modes/markdown
+//= require codemirror/modes/javascript
+//= require codemirror/modes/http
+//= require codemirror/modes/htmlmixed
+//= require codemirror/modes/haml
+//= require codemirror/modes/xml
+//= require codemirror/modes/css
+//= require codemirror/modes/yaml
+//= require codemirror/modes/slim
+//= require codemirror/modes/php
+//= require summernote
+//= require phcpress/editors/phc_summernote.js

data/app/assets/javascripts/phcpress/editors/phc_summernote.js

@@ -0,0 +1,27 @@
+$(function() {
+	var summer_note;
+	summer_note = $('#articles_post_psttext');
+	summer_note.summernote({
+		height: 800,
+		toolbar: [
+			// [groupName, [list of button]]
+			['style', ['bold', 'italic', 'underline', 'clear']],
+			['font', ['strikethrough', 'superscript', 'subscript']],
+			['fontsize', ['fontsize']],
+			['color', ['color']],
+			['para', ['ul', 'ol', 'paragraph']],
+			['height', ['height']],
+			['view', ['fullscreen', 'codeview']],
+		],
+		codemirror: {
+			lineNumbers: true,
+			tabSize: 2,
+			theme: "solarized light"
+		}
+	});
+	summer_note.code(summer_note.val());
+	return summer_note.closest('form').submit(function() {
+		summer_note.val(summer_note.code());
+		return true;
+	});
+});

data/app/assets/stylesheets/phcpress/application.scss

@@ -14,10 +14,15 @@
  *= require_self
  */
 
-// Bootstrap & Font Awesome
+// Editor: Summernote & Code Mirror
+@import "summernote";
+@import "codemirror";
+@import "codemirror/themes/solarized";
+
+// UI: Bootstrap & Font Awesome
 @import "bootstrap-sprockets";
 @import "bootstrap";
 @import "font-awesome";
 
-// Custom Alterations
+// Other: Custom Alterations
 @import "custom";

data/app/controllers/phcpress/articles/posts_controller.rb

@@ -60,7 +60,7 @@ module Phcpress
 
 		# Params Whitelist
 		def articles_post_params
-			params.require(:articles_post).permit(:psttitle, :psttext, :pstexcerpts, :pststatus, :pstimage, :remove_pstimage, category_ids: [])
+			params.require(:articles_post).permit(:psttitle, :psttext, :pststatus, :pstimage, :remove_pstimage, category_ids: [])
 		end
 
 	end

data/app/views/phcpress/articles/posts/_form.html.erb

@@ -66,13 +66,8 @@
 						<%= f.text_field :psttitle, class: "form-control" %>
 					</div>
 					<div class="form-group">
-						<%= f.label :psttext, "Text" %>
 						<%= f.text_area :psttext, class: "form-control" %>
 					</div>
-					<div class="form-group">
-						<%= f.label :pstexcerpts, "Excerpts/Text Leads" %>
-						<%= f.text_area :pstexcerpts, class: "form-control" %>
-					</div>
 				</div>
 			</div>
 

data/app/views/phcpress/articles/posts/index.html.erb

@@ -27,7 +27,7 @@
 							<td><%= articles_post.pststatus %></td>
 							<td><div class="btn-group" role="group" aria-label="Blog Articles">
 								<%= link_to 'Edit', edit_articles_post_path(articles_post), class: "btn btn-primary btn-xs" %>
-								<%= link_to 'Trash', articles_post, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %>
+								<%= link_to 'Delete', articles_post, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %>
 							</div></td>
 						</tr>
 					<% end %>

data/db/migrate/20160720181307_create_phcpress_articles_posts.rb

@@ -5,7 +5,6 @@ class CreatePhcpressArticlesPosts < ActiveRecord::Migration[5.0]
 			t.string :psttitle
 			t.text :psttext
 			t.string :pststatus
-			t.text :pstexcerpts
 			t.string :pstimage
 
 			t.timestamps

data/lib/phcpress/engine.rb

@@ -12,6 +12,11 @@ module Phcpress
 		
 		# Load Image Processing
 		require 'carrierwave'
+		require 'cloudinary'
+
+		# UI Dependencies
+		require 'summernote-rails'
+		require 'codemirror-rails'
 
 		# Give Everything a Namespace
 		isolate_namespace Phcpress

data/lib/phcpress/version.rb

@@ -1,3 +1,3 @@
 module Phcpress
-    VERSION = "5.1.0"
+    VERSION = "5.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcpress
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -258,20 +258,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.6
-- !ruby/object:Gem::Dependency
-  name: carrierwave
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -326,6 +312,68 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.12.1
+- !ruby/object:Gem::Dependency
+  name: summernote-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1.1
+- !ruby/object:Gem::Dependency
+  name: codemirror-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.2
+- !ruby/object:Gem::Dependency
+  name: cloudinary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -512,11 +560,9 @@ files:
 - Rakefile
 - app/assets/config/phcpress_manifest.js
 - app/assets/javascripts/phcpress/application.js
-- app/assets/javascripts/phcpress/modules/connections.js
+- app/assets/javascripts/phcpress/editors/phc_summernote.js
 - app/assets/stylesheets/phcpress/_custom.scss
 - app/assets/stylesheets/phcpress/application.scss
-- app/assets/stylesheets/phcpress/modules/connections.scss
-- app/assets/stylesheets/scaffolds.scss
 - app/controllers/phcpress/application_controller.rb
 - app/controllers/phcpress/articles/posts_controller.rb
 - app/controllers/phcpress/modules/categories_controller.rb

data/app/assets/javascripts/phcpress/modules/connections.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/phcpress/modules/connections.scss

@@ -1,3 +0,0 @@
-// Place all the styles related to the modules::connections controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/

data/app/assets/stylesheets/scaffolds.scss

@@ -1,89 +0,0 @@
-body {
-  background-color: #fff;
-  color: #333;
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-  margin: 33px;
-}
-
-p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-  margin: 33px;
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-a {
-  color: #000;
-
-  &:visited {
-    color: #666;
-  }
-
-  &:hover {
-    color: #fff;
-    background-color: #000;
-  }
-}
-
-th {
-  padding-bottom: 5px;
-}
-
-td {
-  padding-bottom: 7px;
-  padding-left: 5px;
-  padding-right: 5px;
-}
-
-div {
-  &.field, &.actions {
-    margin-bottom: 10px;
-  }
-}
-
-#notice {
-  color: green;
-}
-
-.field_with_errors {
-  padding: 2px;
-  background-color: red;
-  display: table;
-}
-
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-
-  h2 {
-    text-align: left;
-    font-weight: bold;
-    padding: 5px 5px 5px 15px;
-    font-size: 12px;
-    margin: -7px;
-    margin-bottom: 0;
-    background-color: #c00;
-    color: #fff;
-  }
-
-  ul li {
-    font-size: 12px;
-    list-style: square;
-  }
-}
-
-label {
-  display: block;
-}