optimacms 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ba833796543029aa08184a6e5a23c2f8661c286
-  data.tar.gz: 5afeb47185e7007468fe814ec9a54fbe7e7d8135
+  metadata.gz: 4fa7dff6e7a8463916221c0fe0ec24862fb638f5
+  data.tar.gz: eefeceba1bf788b1f673959f5ca163ef201a1482
 SHA512:
-  metadata.gz: 053fa5fa35f77fcc71a98bf3765979bf539ce507b29c3538e7d0ed53eaa9133fc13235517dbe45ceccdcd25fa19f931912e3aa74fd647f7a297bada3d88525fa
-  data.tar.gz: f01940593e3016b2ccbc3b66d4ee4b002e7a43159d61f37765fcf49c912ff276200ab93dbdac9da9617857b9ab1494db8ec85dfaa7649bbd67d4fce775c18639
+  metadata.gz: cfdb6c912ce1a29221b1aba87b35a9a48f9340ea5a24c745a4eef9d672789094da56fee7bbf98432c4406e3525eb62773f3abaf6e18019426524041b96b80402
+  data.tar.gz: 0613e1a83fb931174ed467851b53e413906f1932ad9290cedc9e11692043e169d6c9f4f57660c70082fd12a9c3bd5435629201e6ce70e5c04b7b5c5b3c2dcfaa

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.2.22"
+  VERSION = "0.2.23"
 end

data/spec/dummy/app/assets/stylesheets/application.scss

@@ -1,13 +1,7 @@
-
-
 /* html */
-
 html,
-
 body {
-
   height: 100%;
-
 }
 
 
@@ -45,53 +39,29 @@ body {
 /* main layout */
 
 #topbar{
-
-  background-color: $col-blue-1;
-
-
+  //background-color: $col-blue-1;
 
   a{
-
     color: #ffffff;
-
   }
 
-
-
   ul.nav{
-
     a{
-
-      color: $gray;
-
+      //color: $gray;
     }
-
   }
-
 }
 
 
 
-
-
 // solution 1
-
-
-
 .main-container:before {
-
     background-color: #ffffff;
-
     bottom: 0;
-
     content: "";
-
     display: block;
-
     max-width: inherit;
-
     position: absolute;
-
     top: 0;
 
     width: 100%;
@@ -256,42 +226,27 @@ body {
 
       font-size:13px;
 
-      color: $gray-light;
+      //color: $gray-light;
 
       text-decoration: underline;
 
 
 
       &:hover{
-
-        color:$gray-lighter;
-
+        //color:$gray-lighter;
       }
 
     }
 
-
-
-
-
     .t{
-
       color: #ffffff;
-
     }
 
-
-
     #footer-socials {
-
       margin-top: 12px;
-
       text-align: left;
 
-
-
       li a {
-
         color: #777777;
 
         font-size: 17px;
@@ -355,29 +310,17 @@ body {
 
 
   h1{
-
     margin: 0 8px 0px 0px;
-
-    color: $col-blue-2;
-
+    //color: $col-blue-2;
     font-size: 24px;
-
     font-weight: lighter;
-
     padding: 0;
 
-
-
     small {
-
-      color: $col-blue-4;
-
+      //color: $col-blue-4;
       font-size: 14px;
-
       font-weight: 400;
-
       margin: 0 6px;
-
     }
 
   }
@@ -393,29 +336,17 @@ body {
 
 
 div.breadcrumbs{
-
-  background-color: $gray-light-light;
-
+  //background-color: $gray-light-light;
   border-bottom: 1px solid #e5e5e5;
-
   line-height: 30px;
-
   min-height: 35px;
-
   padding: 4px 0px 4px 0;
-
   position: relative;
-
   z-index: auto;
-
   font-size: 13px;
 
-
-
   ul.breadcrumb{
-
     margin-bottom:0px;
-
   }
 
 }

data/spec/dummy/app/views/company/p2.en.html.haml

@@ -0,0 +1 @@
+111

data/spec/dummy/config/database.yml

@@ -19,7 +19,10 @@ default: &default
 
 development:
   <<: *default
-  database: my_cms
+  host: <%= Rails.application.secrets.db_host %>
+  database: <%= Rails.application.secrets.db %>
+  username: <%= Rails.application.secrets.db_user %>
+  password: <%= Rails.application.secrets.db_password %>
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".

data/spec/dummy/config/secrets.yml

@@ -13,6 +13,12 @@
 development:
   secret_key_base: e135e2b53ab10b0afff68c3f7f0d96e491146342113ab6e1c38409af772139d5317e3da8946ef9f6e6474eb937bc86c11ffe8406c2f9c2369fb6ec1a5b9c4d3b
 
+  db: my_cms
+  db_host: 10.1.10.21
+  db_user: mmx
+  db_password: Galactic1
+
+
 test:
   secret_key_base: 8ab08b04db9f09047e4333306df25eab59472443ee5574b8fd0feb8873b17f97afe924e3380ad50f6197718707d8c474cd7578bd9deb6f708b83072e5e89226f
 

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,154 +10,156 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150610225422) do
+ActiveRecord::Schema.define(version: 0) do
 
-  create_table "cms_languages", force: :cascade do |t|
+  create_table "cms_languages", unsigned: true, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
     t.string  "title",     limit: 250
     t.string  "lang",      limit: 4
-    t.boolean "enabled",   limit: 1,   default: true,              null: false
+    t.boolean "enabled",               default: true,              null: false, unsigned: true
     t.string  "charset",   limit: 15,  default: "utf8_unicode_ci", null: false
-    t.string  "locale",    limit: 255,                             null: false
+    t.string  "locale",                                            null: false
     t.string  "lang_html", limit: 10,                              null: false
-    t.integer "pos",       limit: 4,                               null: false
-    t.string  "countries", limit: 255,                             null: false
+    t.integer "pos",                                               null: false
+    t.string  "countries",                                         null: false
+    t.index ["lang"], name: "idxLang", unique: true, using: :btree
   end
 
-  add_index "cms_languages", ["lang"], name: "idxLang", unique: true, using: :btree
-
-  create_table "cms_mediafiles", force: :cascade do |t|
-    t.integer  "media_type",         limit: 4
-    t.string   "path",               limit: 255
-    t.string   "photo_file_name",    limit: 255
-    t.string   "photo_content_type", limit: 255
-    t.integer  "photo_file_size",    limit: 4
+  create_table "cms_mediafiles", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
+    t.integer  "media_type"
+    t.string   "path"
+    t.string   "photo_file_name"
+    t.string   "photo_content_type"
+    t.integer  "photo_file_size"
     t.datetime "photo_updated_at"
   end
 
-  create_table "cms_pages", force: :cascade do |t|
-    t.string   "title",             limit: 255,                 null: false
-    t.string   "name",              limit: 255
-    t.string   "url",               limit: 255
-    t.integer  "url_parts_count",   limit: 1,   default: 0,     null: false
-    t.integer  "url_vars_count",    limit: 1,   default: 0,     null: false
-    t.string   "parsed_url",        limit: 255
-    t.integer  "parent_id",         limit: 4,   default: 0,     null: false
-    t.string   "view_path",         limit: 255
-    t.boolean  "is_translated",     limit: 1,   default: false, null: false
-    t.integer  "status",            limit: 4,   default: 0,     null: false
-    t.integer  "pos",               limit: 4,   default: 0,     null: false
-    t.string   "redir_url",         limit: 255
-    t.integer  "template_id",       limit: 4
-    t.integer  "layout_id",         limit: 4
-    t.integer  "owner",             limit: 4
-    t.boolean  "is_folder",         limit: 1,   default: false, null: false
-    t.string   "controller_action", limit: 255
-    t.datetime "created_at",                                    null: false
-    t.datetime "updated_at",                                    null: false
-    t.integer  "enabled",           limit: 1,   default: 1,     null: false
+  create_table "cms_pages", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0" do |t|
+    t.string   "title",                                       null: false
+    t.string   "name"
+    t.string   "url"
+    t.integer  "url_parts_count",   limit: 1, default: 0,     null: false, unsigned: true
+    t.integer  "url_vars_count",    limit: 1, default: 0,     null: false, unsigned: true
+    t.string   "parsed_url"
+    t.integer  "parent_id",                   default: 0,     null: false
+    t.string   "view_path"
+    t.boolean  "is_translated",               default: false, null: false, unsigned: true
+    t.integer  "status",                      default: 0,     null: false
+    t.integer  "pos",                         default: 0,     null: false
+    t.string   "redir_url"
+    t.integer  "template_id"
+    t.integer  "layout_id"
+    t.integer  "owner"
+    t.boolean  "is_folder",                   default: false, null: false, unsigned: true
+    t.string   "controller_action"
+    t.datetime "created_at",                                  null: false
+    t.datetime "updated_at",                                  null: false
+    t.integer  "enabled",           limit: 1, default: 1,     null: false, unsigned: true
+    t.index ["parent_id"], name: "parent_id", using: :btree
+    t.index ["status"], name: "status", using: :btree
+    t.index ["url"], name: "url", using: :btree
   end
 
-  add_index "cms_pages", ["name"], name: "index_cms_pages_on_name", using: :btree
-  add_index "cms_pages", ["parent_id"], name: "parent_id", using: :btree
-  add_index "cms_pages", ["status"], name: "status", using: :btree
-  add_index "cms_pages", ["url"], name: "url", using: :btree
-
-  create_table "cms_pages_translation", force: :cascade do |t|
-    t.integer "item_id",           limit: 4,     default: 0, null: false
-    t.integer "page_id",           limit: 4
-    t.string  "lang",              limit: 5,                 null: false
-    t.string  "meta_title",        limit: 255
-    t.text    "meta_description",  limit: 65535
-    t.string  "meta_keywords",     limit: 255
-    t.string  "template_filename", limit: 255
+  create_table "cms_pages_translation", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0" do |t|
+    t.integer "item_id",                     default: 0, null: false, unsigned: true
+    t.integer "page_id"
+    t.string  "lang",              limit: 5,             null: false
+    t.string  "meta_title"
+    t.string  "meta_description"
+    t.string  "meta_keywords"
+    t.string  "template_filename"
+    t.index ["item_id"], name: "item_id", using: :btree
+    t.index ["lang"], name: "lang", using: :btree
+    t.index ["template_filename"], name: "template", using: :btree
   end
 
-  add_index "cms_pages_translation", ["item_id"], name: "item_id", using: :btree
-  add_index "cms_pages_translation", ["lang"], name: "lang", using: :btree
-  add_index "cms_pages_translation", ["template_filename"], name: "template", using: :btree
-
-  create_table "cms_templates", force: :cascade do |t|
-    t.string   "title",         limit: 255,                 null: false
-    t.string   "name",          limit: 255
-    t.string   "basename",      limit: 255,                 null: false
-    t.string   "basepath",      limit: 255,                 null: false
-    t.string   "basedirpath",   limit: 255,                 null: false
+  create_table "cms_templates", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0" do |t|
+    t.string   "title",                                   null: false
+    t.string   "name"
+    t.string   "basename",                                null: false
+    t.string   "basepath",                                null: false
+    t.string   "basedirpath",                             null: false
     t.integer  "type_id",       limit: 1
-    t.string   "tpl_format",    limit: 255
-    t.integer  "pos",           limit: 4
-    t.boolean  "is_translated", limit: 1,   default: false, null: false
-    t.datetime "created_at",                                null: false
-    t.datetime "updated_at",                                null: false
-    t.boolean  "is_folder",     limit: 1,   default: false, null: false
-    t.boolean  "enabled",       limit: 1,   default: true,  null: false
-    t.string   "ancestry",      limit: 255
+    t.string   "tpl_format"
+    t.integer  "pos"
+    t.boolean  "is_translated",           default: false, null: false, unsigned: true
+    t.datetime "created_at",                              null: false
+    t.datetime "updated_at",                              null: false
+    t.boolean  "is_folder",               default: false, null: false
+    t.boolean  "enabled",                 default: true,  null: false, unsigned: true
+    t.string   "ancestry"
+    t.index ["ancestry"], name: "ancestry", using: :btree
+    t.index ["basepath"], name: "basepath", using: :btree
+    t.index ["pos"], name: "pos", using: :btree
   end
 
-  add_index "cms_templates", ["ancestry"], name: "ancestry", using: :btree
-  add_index "cms_templates", ["basepath"], name: "basepath", using: :btree
-  add_index "cms_templates", ["pos"], name: "pos", using: :btree
-
-  create_table "cms_templates_translation", force: :cascade do |t|
-    t.integer "item_id", limit: 4, null: false
+  create_table "cms_templates_translation", unsigned: true, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
+    t.integer "item_id",           null: false, unsigned: true
     t.string  "lang",    limit: 5, null: false
+    t.index ["item_id", "lang"], name: "item_id", unique: true, using: :btree
   end
 
-  add_index "cms_templates_translation", ["item_id", "lang"], name: "item_id", unique: true, using: :btree
-
-  create_table "cms_templatetypes", force: :cascade do |t|
-    t.string  "name",  limit: 255
-    t.string  "title", limit: 255
-    t.integer "pos",   limit: 4,   null: false
+  create_table "cms_templatetypes", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
+    t.string  "name"
+    t.string  "title"
+    t.integer "pos",   null: false
   end
 
-  create_table "cms_users", force: :cascade do |t|
-    t.string   "email",                  limit: 255, default: "", null: false
-    t.string   "encrypted_password",     limit: 255, default: "", null: false
-    t.string   "reset_password_token",   limit: 255
+  create_table "cms_users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
+    t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          limit: 4,   default: 0,  null: false
+    t.integer  "sign_in_count",          default: 0,  null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip",     limit: 255
-    t.string   "last_sign_in_ip",        limit: 255
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["email"], name: "index_optimacms_cms_users_on_email", unique: true, using: :btree
+    t.index ["reset_password_token"], name: "index_optimacms_cms_users_on_reset_password_token", unique: true, using: :btree
   end
 
-  add_index "cms_users", ["email"], name: "index_optimacms_cms_users_on_email", unique: true, using: :btree
-  add_index "cms_users", ["reset_password_token"], name: "index_optimacms_cms_users_on_reset_password_token", unique: true, using: :btree
-
-  create_table "news", force: :cascade do |t|
-    t.string   "title",       limit: 255
-    t.text     "description", limit: 65535
-    t.datetime "created_at",                null: false
-    t.datetime "updated_at",                null: false
-  end
-
-  create_table "optimacms_articles", force: :cascade do |t|
-    t.string   "title",      limit: 255
+  create_table "optimacms_articles", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
+    t.string   "title"
     t.text     "text",       limit: 65535
     t.datetime "created_at",               null: false
     t.datetime "updated_at",               null: false
   end
 
-  create_table "users", force: :cascade do |t|
-    t.string   "email",                  limit: 255, default: "", null: false
-    t.string   "encrypted_password",     limit: 255, default: "", null: false
-    t.string   "reset_password_token",   limit: 255
+  create_table "optimacms_cms_users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
+    t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          limit: 4,   default: 0,  null: false
+    t.integer  "sign_in_count",          default: 0,  null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip",     limit: 255
-    t.string   "last_sign_in_ip",        limit: 255
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["email"], name: "index_optimacms_cms_users_on_email", unique: true, using: :btree
+    t.index ["reset_password_token"], name: "index_optimacms_cms_users_on_reset_password_token", unique: true, using: :btree
   end
 
-  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
+  create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
+    t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",          default: 0,  null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
+  end
 
 end