roroacms 0.0.3 → 0.0.4

data/app/assets/stylesheets/roroacms/vendor/hopscotch.css

@@ -1,42 +1,3 @@
-/**! hopscotch - v0.2.0
-*
-* Copyright 2014 LinkedIn Corp. All rights reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/**
- * This fade animation is based on Dan Eden's animate.css (http://daneden.me/animate/), under the terms of the MIT license.
- *
- * Copyright 2013 Dan Eden.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
 .animated {
   -webkit-animation-fill-mode: both;
   -moz-animation-fill-mode: both;
@@ -234,7 +195,6 @@
   animation-name: fadeInLeft;
 }
 div.hopscotch-bubble .hopscotch-nav-button {
-  /* borrowed from katy styles */
   font-weight: bold;
   border-width: 1px;
   border-style: solid;
@@ -279,7 +239,6 @@ div.hopscotch-bubble .hopscotch-nav-button.next {
   border-color: #1b5480;
   color: #fff;
   margin: 0 0 0 10px;
-  /* HS specific*/
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.35);
   background-color: #287bbc;
   filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#287bbc', endColorstr='#23639a');
@@ -327,11 +286,8 @@ div.hopscotch-bubble {
   position: absolute;
   z-index: 999999;
   -moz-background-clip: padding;
-  /* for Mozilla browsers*/
   -webkit-background-clip: padding;
-  /* Webkit */
   background-clip: padding-box;
-  /*  browsers with full support */
   box-shadow:1px 1px 2px rgba(0, 0, 0, 0.2);
 }
 div.hopscotch-bubble.animate {
@@ -373,7 +329,6 @@ div.hopscotch-bubble .hopscotch-bubble-container {
   position: relative;
   text-align: left;
   -webkit-font-smoothing: antialiased;
-  /* to fix text flickering */
 }
 div.hopscotch-bubble .hopscotch-content {
   font-family: 'Open Sans',sans-serif;
@@ -384,9 +339,7 @@ div.hopscotch-bubble .hopscotch-content {
   margin: -5px 0 11px;
   padding-top: 20px;
 }
-div.hopscotch-bubble .hopscotch-bubble-content {
-  /*margin: 0 0 0 40px;*/
-}
+
 div.hopscotch-bubble.no-number .hopscotch-bubble-content {
   margin: 0;
 }
@@ -501,7 +454,6 @@ div.hopscotch-bubble .hopscotch-actions {
   margin: 10px 0 0;
   text-align: right;
 }
-/* Overlay styles */
 div.hopscotch-overlay {
   position: absolute;
   opacity: .3;

data/app/assets/stylesheets/roroacms/vendor/icheck/css/{_all.css → _all.css.erb}

@@ -289,7 +289,7 @@
     padding: 0;
     width: 20px;
     height: 20px;
-    background: url(grey.png) no-repeat;
+    background: url(<%=asset_path "roroacms/admin/grey.png"%>) no-repeat;
     border: none;
     cursor: pointer;
 }
@@ -329,7 +329,7 @@
        only screen and (min-device-pixel-ratio: 1.5) {
     .icheckbox_flat-grey,
     .iradio_flat-grey {
-        background-image: url(grey@2x.png);
+        background-image: url(<%=asset_path "roroacms/admin/grey@2x.png"%>);
         -webkit-background-size: 176px 22px;
         background-size: 176px 22px;
     }

data/app/assets/stylesheets/roroacms/vendor/icheck/css/{grey.css → grey.css.erb}

@@ -9,7 +9,7 @@
     padding: 0;
     width: 20px;
     height: 20px;
-    background: url(grey.png) no-repeat;
+    background: url(<%=asset_path "roroacms/admin/grey.png"%>) no-repeat;
     border: none;
     cursor: pointer;
 }
@@ -49,7 +49,7 @@
        only screen and (min-device-pixel-ratio: 1.5) {
     .icheckbox_flat-grey,
     .iradio_flat-grey {
-        background-image: url(grey@2x.png);
+        background-image: url(<%=asset_path "roroacms/admin/grey@2x.png"%>);
         -webkit-background-size: 176px 22px;
         background-size: 176px 22px;
     }

data/app/assets/stylesheets/roroacms/vendor/typeahead.css

@@ -1,11 +1,3 @@
-/*
- * typehead.js-bootstrap3.less
- * @version 0.2.3
- * https://github.com/hyspace/typeahead.js-bootstrap3.less
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
 .has-warning .twitter-typeahead .tt-input,
 .has-warning .twitter-typeahead .tt-hint {
   border-color: #8a6d3b;
@@ -152,7 +144,7 @@ fieldset[disabled] .twitter-typeahead .tt-input {
   z-index: 1 !important;
   min-width: 160px;
   width: 100%;
-  // padding: 5px 0;
+  /* padding: 5px 0;*/
   margin: -2px 0 0 0;
   list-style: none;
   font-size: 14px;
@@ -161,8 +153,8 @@ fieldset[disabled] .twitter-typeahead .tt-input {
   border: 1px solid rgba(0, 0, 0, 0.15);
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
-  // -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-  // box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  /* -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);*/
+  /* box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);*/
   background-clip: padding-box;
   *border-right-width: 2px;
   *border-bottom-width: 2px;

data/app/helpers/roroacms/general_helper.rb

@@ -110,7 +110,9 @@ module Roroacms
 
     def strip_url(url)
 
-      url.sub!(/www./, '')            if url.include? "www."
+      return url if url.blank?
+
+      url.sub!(/www./, '')        if url.include? "www."
       
       url.sub!(/https\:\/\//, '') if url.include? "https://"
 

data/app/views/layouts/roroacms/admin.html.erb

@@ -41,7 +41,6 @@
                 <ul>
                     <li class="profile-photo">
                         <%= link_to roroacms.edit_admin_administrator_path(session[:admin_id]) do %>
-                          <img src="<%= current_user.avatar %>" class="img-circle" width="35" height="35">
                         <% end %>
                     </li>
                 </ul>

data/lib/roroacms/engine.rb

@@ -42,6 +42,7 @@ module Roroacms
       Devise::ConfirmationsController.layout "roroacms/login"
       Devise::UnlocksController.layout "roroacms/login"
       Devise::PasswordsController.layout "roroacms/login"
+      ApplicationController.helper(ActionView::Helpers::ThemeHelper) if File.exists?("#{Rails.root}/app/helpers/theme_helper.rb")
     end
     
     require "#{Roroacms::Engine.root}/app/models/roroacms/setting.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roroacms
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -299,8 +299,12 @@ files:
 - app/assets/images/roroacms/admin/avatar4.gif
 - app/assets/images/roroacms/admin/avatar5.gif
 - app/assets/images/roroacms/admin/avatar6.gif
+- app/assets/images/roroacms/admin/chosen-sprite.png
+- app/assets/images/roroacms/admin/chosen-sprite@2x.png
 - app/assets/images/roroacms/admin/favicon-old.ico
 - app/assets/images/roroacms/admin/favicon.ico
+- app/assets/images/roroacms/admin/grey.png
+- app/assets/images/roroacms/admin/grey@2x.png
 - app/assets/images/roroacms/admin/logo.png
 - app/assets/images/roroacms/admin/roroa-logo.png
 - app/assets/images/roroacms/admin/roroafull.png
@@ -333,12 +337,10 @@ files:
 - app/assets/javascripts/roroacms/vendor/select.js
 - app/assets/javascripts/roroacms/vendor/sortable.js
 - app/assets/stylesheets/roroacms/admin/application.css
-- app/assets/stylesheets/roroacms/admin/main.css
+- app/assets/stylesheets/roroacms/admin/main.css.erb
 - app/assets/stylesheets/roroacms/vendor/animate.css
 - app/assets/stylesheets/roroacms/vendor/bootstrap/css/bootstrap.min.css
-- app/assets/stylesheets/roroacms/vendor/chosen/chosen-sprite.png
-- app/assets/stylesheets/roroacms/vendor/chosen/chosen-sprite@2x.png
-- app/assets/stylesheets/roroacms/vendor/chosen/chosen.css
+- app/assets/stylesheets/roroacms/vendor/chosen/chosen.css.erb
 - app/assets/stylesheets/roroacms/vendor/datatables/css/dataTables.css
 - app/assets/stylesheets/roroacms/vendor/datatables/images/back_disabled.png
 - app/assets/stylesheets/roroacms/vendor/datatables/images/back_enabled.png
@@ -351,11 +353,10 @@ files:
 - app/assets/stylesheets/roroacms/vendor/datatables/images/sort_both.png
 - app/assets/stylesheets/roroacms/vendor/datatables/images/sort_desc.png
 - app/assets/stylesheets/roroacms/vendor/datatables/images/sort_desc_disabled.png
-- app/assets/stylesheets/roroacms/vendor/editor.css
 - app/assets/stylesheets/roroacms/vendor/ghostdown.css
 - app/assets/stylesheets/roroacms/vendor/hopscotch.css
-- app/assets/stylesheets/roroacms/vendor/icheck/css/_all.css
-- app/assets/stylesheets/roroacms/vendor/icheck/css/grey.css
+- app/assets/stylesheets/roroacms/vendor/icheck/css/_all.css.erb
+- app/assets/stylesheets/roroacms/vendor/icheck/css/grey.css.erb
 - app/assets/stylesheets/roroacms/vendor/icheck/css/grey.png
 - app/assets/stylesheets/roroacms/vendor/icheck/css/grey@2x.png
 - app/assets/stylesheets/roroacms/vendor/jquery/jquery-ui.css