pixelforce_cms 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3b33b071e31f30320d288854bb092c92f4daf92
-  data.tar.gz: 53f3d29a3afd93dc5a4595eae79e8fadb01c87ad
+  metadata.gz: 34571a6cee516e994e5ebea2da74748fdfdef1de
+  data.tar.gz: 64d951a8b0641e9158653d5c9bf911e03d17c504
 SHA512:
-  metadata.gz: 7ca09abad787ffb3b2c7546173938e538617136ad533db2a0b1124960fa2e8e2b102f6e4a5e84a5fb7f6a50e6cb7151c942f55d2cbf77fd5533bf21c4e5cdb2c
-  data.tar.gz: df5768920dd5bfd547b4d605001de0cadabc3646b0cd14777c5fb0a7baf7ff1b69ce05b12f7c1598642ede08ec85ae454dc362ec1bb61ee1147910acb4fdf922
+  metadata.gz: f839413bcebb7aca0b67742b6d1a3d39f6967be0adb16e861b0f584a0878884ffa94f839b6182ab4fcb9490eeb690914b8aeabaac119d730c5c4c45c96c1d319
+  data.tar.gz: bce4464a139c3e92e0384c3dbe2dca7b8e7297c95d54c48f8d60cc3b6aabae3615fc755b275b6710d4d2cd65f330b132b0c65394c5723599e862cfef2f3f0928

data/lib/generators/pixelforce_cms/controller_generator.rb

@@ -7,11 +7,13 @@ module PixelforceCms
       argument :controller_name, type: :string
 
       def create_controller
+        @controller_name = controller_name
         template "base_controller.rb", "app/controllers/admin/base_controller.rb"
         template "admin_controller.rb", "app/controllers/admin/#{file_name.pluralize}_controller.rb"
       end
 
       def create_views
+        @controller_name = controller_name
         # template 'index.html.haml', "app/views/admin/#{file_name}/index.html.haml"
         template 'new.html.haml', "app/views/admin/#{file_name}/new.html.haml"
         template 'edit.html.haml', "app/views/admin/#{file_name}/edit.html.haml"

data/lib/generators/pixelforce_cms/install_generator.rb

@@ -7,12 +7,15 @@ module PixelforceCms
 
       def copy_assets
         copy_file "javascripts/application.js", "app/assets/javascripts/application.js"
-        copy_file "css/application.css", "app/assets/stylesheets/application.css"
-        copy_file "css/_variables.css.scss", "vendor/assets/stylesheets/_variables.css.scss"
         copy_file "css/style.css.scss", 'vendor/assets/stylesheets/style.css.scss'
         copy_file "css/style.responsive.css.scss", 'vendor/assets/stylesheets/style.responsive.css.scss'
+        copy_file "css/application/application.css", "app/assets/stylesheets/application/application.css"
         copy_file "css/application/chromeframe.css.scss", 'vendor/assets/stylesheets/application/chromeframe.css.scss'
+        copy_file "css/application/document.css.scss", 'vendor/assets/stylesheets/application/document.css.scss'
         copy_file "css/application/html5.css.scss", 'vendor/assets/stylesheets/application/html5.css.scss'
+        copy_file "css/application/index.css.scss", 'vendor/assets/stylesheets/application/index.css.scss'
+        copy_file "css/application/variables.css.scss", "vendor/assets/stylesheets/application/variables.css.scss"
+        copy_file "css/pages/home.css.scss", "vendor/assets/stylesheets/pages/home.css.scss"
       end
 
       def copy_gemfile

data/lib/generators/pixelforce_cms/templates/Gemfile

@@ -18,7 +18,8 @@ gem 'meta-tags', :require => 'meta_tags'
 gem 'exception_notification'
 
 # pixelforce template
-gem 'pixelforce_cms', git: 'git@github.com:BenZhang/pixelforce_cms.git'
+gem 'pixelforce_cms', '~> 0.7'
+# gem 'pixelforce_cms', path: '/Users/ben/workspace/pixelforce_cms'
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -40,6 +41,9 @@ group :assets do
   gem 'font-awesome-sass-rails'
   gem 'anjlab-bootstrap-rails', :require => 'bootstrap-rails',
                                 :github => 'anjlab/bootstrap-rails'
+  
+  gem 'jquery-ui-rails'         
+  gem 'fancybox2-rails', '~> 0.2.4'                       
 end
 
 gem 'jquery-rails'

data/lib/generators/pixelforce_cms/templates/_form.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for(@<%= controller_name.singularize.underscore %>, :html => { class: 'form-horizontal' }) do |f| %>
+<%= simple_form_for(@<%= @controller_name.singularize.underscore %>, :html => { class: 'form-horizontal' }) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">
@@ -7,6 +7,6 @@
 
   <div class="form-actions">
     <%= f.button :submit, 'Save Changes', class: 'btn btn-stones' %>
-    <%= link_to 'Cancel', <%= controller_name.pluralize.underscore %>_path, class: 'btn' %>
+    <%= link_to 'Cancel', <%= @controller_name.pluralize.underscore %>_path, class: 'btn' %>
   </div>
 <% end %>

data/lib/generators/pixelforce_cms/templates/admin_controller.rb

@@ -1,39 +1,39 @@
-class Admin::<%= controller_name.pluralize.capitalize %>Controller < Admin::BaseController
+class Admin::<%= @controller_name.pluralize.capitalize %>Controller < Admin::BaseController
 
   def index
-    @<%= controller_name.underscore.pluralize %> = <%= controller_name.singularize.capitalize %>.all
+    @<%= @controller_name.underscore.pluralize %> = <%= @controller_name.singularize.capitalize %>.all
   end
 
   def new
-    @<%= controller_name.singularize.underscore %> = <%= controller_name.singularize.capitalize %>.new
+    @<%= @controller_name.singularize.underscore %> = <%= @controller_name.singularize.capitalize %>.new
   end
 
   def create
-    @<%= controller_name.singularize.underscore %> = <%= controller_name.singularize.capitalize %>.new params[:<%= controller_name.singularize.underscore %>]
-    if @<%= controller_name.singularize.underscore %>.save
-      redirect_to <%= controller_name.underscore.pluralize %>_path
+    @<%= @controller_name.singularize.underscore %> = <%= @controller_name.singularize.capitalize %>.new params[:<%= @controller_name.singularize.underscore %>]
+    if @<%= @controller_name.singularize.underscore %>.save
+      redirect_to <%= @controller_name.underscore.pluralize %>_path
     else
       render action: :new
     end
   end
 
   def edit
-    @<%= controller_name.singularize.underscore %> = <%= controller_name.singularize.capitalize %>.find params[:id]
+    @<%= @controller_name.singularize.underscore %> = <%= @controller_name.singularize.capitalize %>.find params[:id]
   end
 
   def update
-    @<%= controller_name.singularize.underscore %> = <%= controller_name.singularize.capitalize %>.find params[:id]
-    if @<%= controller_name.singularize.underscore %>.update_attributes params[:<%= controller_name.underscore %>]
-      redirect_to <%= controller_name.underscore.pluralize %>_path
+    @<%= @controller_name.singularize.underscore %> = <%= @controller_name.singularize.capitalize %>.find params[:id]
+    if @<%= @controller_name.singularize.underscore %>.update_attributes params[:<%= @controller_name.underscore %>]
+      redirect_to <%= @controller_name.underscore.pluralize %>_path
     else
       render action: :edit
     end
   end
 
   def destroy
-    @<%= controller_name.singularize.underscore %> = <%= controller_name.singularize.capitalize %>.find params[:id]
-    @<%= controller_name.singularize.underscore %>.destroy
-    redirect_to <%= controller_name.pluralize.underscore.pluralize %>_path
+    @<%= @controller_name.singularize.underscore %> = <%= @controller_name.singularize.capitalize %>.find params[:id]
+    @<%= @controller_name.singularize.underscore %>.destroy
+    redirect_to <%= @controller_name.pluralize.underscore.pluralize %>_path
   end
 
 end

data/lib/generators/pixelforce_cms/templates/css/{application.css → application/application.css}

@@ -12,6 +12,6 @@
  *= require application/chromeframe
  *= require twitter/bootstrap
  *= require _font-awesome
-
- *= require style
+ *= require jquery.ui.all 
+ *= require fancybox
  */

data/lib/generators/pixelforce_cms/templates/css/application/document.css.scss

@@ -0,0 +1,10 @@
+// This file was generated by html5-rails
+// https://github.com/sporkd/html5-rails
+// Upgrade with: $ rails generate html5:install
+
+//-----------------------------------------
+// Document styles
+//-----------------------------------------
+
+html {}
+body {}

data/lib/generators/pixelforce_cms/templates/css/application/html5.css.scss

@@ -24,7 +24,6 @@
 //-----------------------------------------
 @import "application/chromeframe";
 @import "application/document";
-@import "application/media_queries"; // Media queries last
 
 //-----------------------------------------
 // Append includes

data/lib/generators/pixelforce_cms/templates/css/application/index.css.scss

@@ -0,0 +1,29 @@
+// This file was generated by html5-rails
+// https://github.com/sporkd/html5-rails
+// Upgrade with: $ rails generate html5:install
+//
+// application styles
+
+//-----------------------------------------
+// Variables
+//-----------------------------------------
+@import 'variables';
+
+//-----------------------------------------
+// Vendor imports
+//-----------------------------------------
+// @import 'compass/css3';
+@import 'h5bp';
+
+//-----------------------------------------
+// Vendor includes
+//-----------------------------------------
+@include h5bp-normalize;
+@include h5bp-main;
+@include h5bp-helpers;
+
+//-----------------------------------------
+// Custom imports
+//-----------------------------------------
+@import 'application';
+@import 'style';

data/lib/generators/pixelforce_cms/templates/css/{_variables.css.scss → application/variables.css.scss}

@@ -8,8 +8,17 @@
 //----------------------------------------------
 // Html5 Boilerplate overrides
 //----------------------------------------------
-$font-color: #222;
 $font-family: 'Roboto', sans-serif;
-$font-size: 1em;
-$link-color: #808285;
-$link-hover-color: #808285;
+
+$background-color: #f2f1e6;
+$font-color: #222;
+$link-color: #949591;
+$link-hover-color: #949591;
+
+$white: #fff;
+$gray: #808285;
+$light-gray: #dfdfdf;
+
+$placeholder: #ddd;
+
+$gutter: 15px;

data/lib/generators/pixelforce_cms/templates/css/style.css.scss

@@ -1,26 +1,20 @@
-@import "variables";
-@import "h5bp";
-@include h5bp-normalize;
-@include h5bp-main;
-@import "application/chromeframe";
-@include h5bp-helpers;
-@include h5bp-media;
-
 html, body { height:100%; }
 body {
   font: 14px/1.4 $font-family;
-  background:#f2f1e6;
+  background: $background-color;
   color: $font-color;
   width:100%;
 }
 
 h1, h2, h3 {
+  font-family: $font-family;
   margin:0 0 15px;
   line-height:1.2;
 }
 h4, h5 { margin:0 0 10px; }
 
 a, .btn-link {
+  outline: 0 !important;
   color: $link-color;
   text-shadow:none;
   &:hover {
@@ -29,6 +23,12 @@ a, .btn-link {
     i { text-decoration:none; }
   }
 }
+.btn {
+  &.btn-default {
+    color: $white;
+    background: $link-color;
+  }
+}
 
 hr {
   height:10px;
@@ -37,48 +37,24 @@ hr {
   border-bottom:1px ridge rgba(0,0,0,0.1);
 }
 
-::-moz-selection{ background: $link-color; color: #fff; text-shadow: none;}
-::selection { background: $link-color; color: #fff; text-shadow: none;} 
+::-moz-selection{ background: $link-color; color: $white; text-shadow: none;}
+::selection { background: $link-color; color: $white; text-shadow: none;} 
 a:link {-webkit-tap-highlight-color: $link-color;} 
 
-ins {background-color: $link-color; color: #fff; text-decoration: none;}
-mark {background-color: $link-color; color: #fff; font-style: italic; font-weight: bold;}
+ins {background-color: $link-color; color: $white; text-decoration: none;}
+mark {background-color: $link-color; color: $white; font-style: italic; font-weight: bold;}
 
-.w_5 { width:5% !important; }
-.w_10 { width:10% !important; }
-.w_15 { width:15% !important; }
-.w_20 { width:20% !important; }
-.w_25 { width:25% !important; }
-.w_30 { width:30% !important; }
-.w_33 { width:33% !important; }
-.w_40 { width:40% !important; }
-.w_50 { width:50% !important; }
-.w_60 { width:60% !important; }
-.w_70 { width:70% !important; }
-.w_80 { width:80% !important; }
-.w_90 { width:90% !important; }
-.w_100 {
-  width:100% !important;
-  [class^="w_"], [class*=" w_"] { float:left; }
-}
 .w_auto { width:auto !important; }
 
-.padd {
-  padding:20px 25px;
-  &.no-l { padding-left:0; }
-  &.no-r { padding-right:0; }
-  &.no-t { padding-top:0; }
-  &.no-b { padding-bottom:0; }
-}
+.padd { padding:20px 25px; }
 .padd-s { padding:15px; }
 .padd-n { padding:0 !important; }
-.bordered { border:1px solid #ccc; }
 
 .block { display:block !important; }
 .inline-block { display:inline-block !important; }
 .inline { display:inline !important; }
 .relative { position:relative; }
-.mb { margin-bottom:20px !important; }
+.mb { margin-bottom: $gutter !important; }
 .mc { margin:0 !important; }
 .ma { margin:0 auto; }
 
@@ -91,11 +67,16 @@ mark {background-color: $link-color; color: #fff; font-style: italic; font-weigh
 .font-xxxlarge { font-size:22px !important; }
 .caps { text-transform:uppercase; }
 
+
 #main {
   min-height: 100%;
   height: auto !important;
   height: 100%;
   margin-bottom:-30px;
+  & > .main-content {
+    padding: 20px;
+  }
 }
 
 @import 'style.responsive';
+@import 'pages/*';

data/lib/generators/pixelforce_cms/templates/css/style.responsive.css.scss

@@ -1,17 +1,6 @@
-@media (min-width: 1200px) {
-  .modal {
-    width: 900px;
-    margin-left: -450px;
-  }
+@media (max-width: 991px) {
 }
 
-@media (min-width: 980px) and (max-width: 1199px) {
-}
-
-@media (max-width: 979px) {
-}
 
 @media (max-width: 767px) {
-  body { padding:0; }
-  .txt_r { text-align:left !important; }
 }

data/lib/generators/pixelforce_cms/templates/edit.html.haml

@@ -1,8 +1,8 @@
-- set_meta_tags title: ' Edit <%= controller_name.camelize %>'
+- set_meta_tags title: ' Edit <%= @controller_name.camelize %>'
 
-%section{id: '<%= controller_name.underscore %>'}
+%section{id: '<%= @controller_name.underscore %>'}
   .widget
     .widget-header
-      %h1 Edit <%= controller_name.camelize %>
+      %h1 Edit <%= @controller_name.camelize %>
     .widget-content
       = render 'form'

data/lib/generators/pixelforce_cms/templates/javascripts/application.js

@@ -13,5 +13,20 @@
 //= require jquery
 //= require jquery_ujs
 //= require twitter/bootstrap
-
+//= require fancybox
 //= require h5bp
+
+
+$(function() {
+
+  $('a[rel=fancybox]').fancybox({
+    type: 'ajax',
+    maxWidth  : 800,
+    maxHeight : 600,
+    fitToView : true,
+    width   : '70%',
+    height    : '70%',
+    autoSize  : true
+  });
+
+});

data/lib/generators/pixelforce_cms/templates/new.html.haml

@@ -1,8 +1,8 @@
-- set_meta_tags title: ' New <%= controller_name.singularize.camelize %>'
+- set_meta_tags title: ' New <%= @controller_name.singularize.camelize %>'
 
-%section{id: '<%= controller_name.singularize.underscore %>'}
+%section{id: '<%= @controller_name.singularize.underscore %>'}
   .widget
     .widget-header
-      %h1 New <%= controller_name.singularize.camelize %>
+      %h1 New <%= @controller_name.singularize.camelize %>
     .widget-content
       = render 'form'

data/lib/pixelforce_cms/version.rb

@@ -1,3 +1,3 @@
 module PixelforceCms
-  VERSION = "0.7"
+  VERSION = "0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelforce_cms
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Ben Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,12 +58,13 @@ files:
 - lib/generators/pixelforce_cms/templates/admin_controller.rb
 - lib/generators/pixelforce_cms/templates/application.html.haml
 - lib/generators/pixelforce_cms/templates/base_controller.rb
-- lib/generators/pixelforce_cms/templates/css/_variables.css.scss
-- lib/generators/pixelforce_cms/templates/css/application.css
+- lib/generators/pixelforce_cms/templates/css/application/application.css
 - lib/generators/pixelforce_cms/templates/css/application/chromeframe.css.scss
 - lib/generators/pixelforce_cms/templates/css/application/document.css.scss
 - lib/generators/pixelforce_cms/templates/css/application/html5.css.scss
-- lib/generators/pixelforce_cms/templates/css/application/media_queries.css.scss
+- lib/generators/pixelforce_cms/templates/css/application/index.css.scss
+- lib/generators/pixelforce_cms/templates/css/application/variables.css.scss
+- lib/generators/pixelforce_cms/templates/css/pages/home.css.scss
 - lib/generators/pixelforce_cms/templates/css/style.css.scss
 - lib/generators/pixelforce_cms/templates/css/style.responsive.css.scss
 - lib/generators/pixelforce_cms/templates/deploy.rb