ruby_gallery 0.2.2 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.4

data/app/assets/stylesheets/ruby_gallery/main.css

@@ -1,142 +1,10 @@
-* {
-	background: none;
-	border: 0;
-	font-weight: normal;
-	margin: 0;
-	padding: 0;
-}
-
-/*body { 
-  background: black url(../images/bg.png);
-  font-family: 'Maven Pro', sans-serif;
-  color: #111;
-}
-*/
-h1 {
-	background: url(../images/h1.png) no-repeat;
-	height: 43px;
-	margin: 80px auto 20px;
-	position: relative;
-	text-indent: -9999px;
-	width: 500px;
-}
-
-h3 {
-	color: #111;
-	font-size: 24px;
-	margin: 10px 0 5px;
-}
-
-h4 {
-	color: #111;
-	font-size: 20px;
-	margin: 10px 0;
-}
-
-p {
-	color: #222;
-	font-size: 14px;
-	line-height: 20px;
-	margin-bottom: 10px;
-}
 
-b {
-	background: rgba(1,1,1,.1);
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	display: inline-block;
-	padding: 1px 3px 1px 3px;
-}
-
-pre { 
-	background: black;
-	border-radius: 5px;
-	color: #ee8;
-	display: block;
-	font-family: 'Monaco', 'Anonymous Pro', sans-serif;
-	font-size: 11px;
-	margin-top: 2px; 
-	margin-bottom: 5px;
-	padding: 15px; 
-}
-
-#main {
-	background: #bba;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border-top: 1px rgba(255,255,255,.6) solid;
-	height: 500px;
-	width: 500px;
-	margin: auto;
-}
 
-#main .nano {
+.nano {
 	text-shadow: #eee 0 1px;
 }
 
-#main pre {
-	background: #222;
-	border-bottom: 1px solid white;
-	border-top: 1px solid black;
-	-webkit-box-shadow: black 0 1px 10px inset;
-	-moz-box-shadow: black 0 1px 10px inset;
-	box-shadow: black 0 1px 10px inset;
-	text-shadow: black 0 -1px 1px;
-}
-
-#main ul, #main ol {
-	display: block;
-	margin: 10px 0;
-}
-
-#main ul li, #main ol li {
-	margin-left: 20px;
-	font-size: 13px;
-}
 
-#main .content h1 {
-	display: block;
-	margin: 0;
-	padding: 0;
-	color: #111;
-	text-indent: 0;
-	background: none;
-	display: none;
-}
-
-#main a {
-	color: #066;
-	text-decoration: none;
-	text-shadow: none;
-}
-
-#main a:hover {
-	text-decoration: underline;
-}
-
-#main code {
-	font-family: 'Monaco', 'Anonymous Pro', sans-serif;
-}
-
-#main p code {
-	background: #222;
-	display: inline-block;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;	
-	border-radius: 5px;
-	font-family: Monaco, 'Anonymous Pro';
-	font-size: 11px;
-	text-shadow: none;
-	color: #ee8;
-	padding: 0 3px 0;
-	border-bottom: 1px solid #eee;
-	-webkit-box-shadow: #000 0 2px 3px inset;
-	-moz-box-shadow: #000 0 2px 3px inset;
-	box-shadow: #000 0 2px 3px inset;
-	text-shadow: black 0 -1px 1px;
-} 
 
 .small.nano {
 	background: #ffa;
@@ -147,15 +15,13 @@ pre {
 	border-radius: 5px;
 }
 
-
 .nano .content {
-padding: 20px;
+  padding: 20px;
 }
 
+
+
 .nano .pane {
-background: #555;
-width: 8px;
-right: 1px;
   margin: 5px;
 }
 

data/app/assets/stylesheets/ruby_gallery/ruby_gallery.css.scss.erb

@@ -18,10 +18,7 @@ span.entypo-icon-1{
   cursor: pointer;
 }
 
-form.fileupload{
-  width:75px;
-  float:left;
-}
+
 
 div.upload-box{
   @include clearfix;
@@ -45,17 +42,21 @@ div.upload-box{
   }
 }
 
+form.fileupload{
+  width:75px;
+  float:left;
+}
 
 div.file-box{
   float: left;
-  @include clearfix;
   display:block;
   margin-bottom: 5px;
   width: 100%;
   
   ul#photos_album {
+    margin: 0px;
+    padding: 0px;
     width: 100%;
-    float: left;
     @include clearfix;
     height: 100%;
     list-style: none;
@@ -66,11 +67,11 @@ div.file-box{
       float: left;
       width: 130px;
       height: 125px;
-      margin-top: 10px;
+      margin-bottom: 15px;
       text-align: center;
       span.remove-photo {
         position: absolute;
-        top: -20px ;
+        top: -17px ;
         right: 10px;
         line-height: 55px;
       }

data/app/helpers/ruby_gallery/ruby_gallery_helper.rb

@@ -1,6 +1,8 @@
 module RubyGallery::RubyGalleryHelper
-  def show_gallery_images(model_name, opts={})
-    object = model_name.to_s.singularize.classify.constantize.find(params[:id])
+  def show_gallery_images(model_obj, opts={})
+    # object = model_name.to_s.singularize.classify.constantize.find_by_id(parent_model_id)
+    object = model_obj
+    model_name = model_obj.class.to_s.tableize
     opts = {reorder: true, close: true}.merge(opts)
     content = ""
     content = content_tag(:div, class: "upload-box") do
@@ -8,7 +10,7 @@ module RubyGallery::RubyGalleryHelper
         content_tag(:div, t("ruby_gallery.web_content.upload_album"), class: "legend"),
         content_tag(:div, class: "form-box") do
           [
-            content_tag(:form, id: "fileupload", class: "fileupload", method: "POST", enctype: "multipart/form-data", action: "/#{model_name}/upload_album?id=#{params[:id]}", multipart: true) do
+            content_tag(:form, id: "fileupload", class: "fileupload", method: "POST", enctype: "multipart/form-data", action: "/#{model_name}/upload_album?id=#{model_obj.id}", multipart: true) do
               content_tag(:span, id: "upload_button", class: "upload-button btn btn-success fileinput-button", status: "") do
                 [content_tag(:i, "", class: "icon-plus icon-white"),
                 content_tag(:span, t("ruby_gallery.web_content.upload_button")),

data/lib/generators/active_record/ruby_gallery_generator.rb

@@ -13,7 +13,6 @@ module ActiveRecord
         route "post '/#{table_name}/upload_album', controller: :#{table_name}, action: :upload_album"
         route "delete '/#{table_name}/:id/delete_photo', controller: :#{table_name}, action: :delete_photo"
         if migration_exists?("album_photos") && migration_add_columns_exists?("album_photos")
-          # migration_template "migration.rb", "db/migrate/ruby_gallery_add_columns_to_album_photos" unless migration_add_columns_exists?("album_photos")
         else
           migration_template "album_photo_migration.rb", "db/migrate/ruby_gallery_create_album_photos"
           migration_template "migration.rb", "db/migrate/ruby_gallery_add_columns_to_album_photos"

data/lib/generators/ruby_gallery/install_generator.rb

@@ -1,7 +1,6 @@
 require 'securerandom'
 require 'rails/generators'
 require 'rails/generators/migration'
-
 module RubyGallery
   module Generators
     class InstallGenerator < Rails::Generators::Base
@@ -20,12 +19,19 @@ module RubyGallery
       end
       
       def inject_css
-        append_to_file 'app/assets/stylesheets/application.css' do
+        file_to_append = 'app/assets/stylesheets/application.css'
+        if File.exist?('app/assets/stylesheets/application.css.scss')
+          file_to_append = 'app/assets/stylesheets/application.css.scss'
+        end
+          
+        append_to_file file_to_append do
           out = "\n"
           out << "/* *= require ruby_gallery/styles */"
         end      
+          
       end
       
+      
     end
   end
 end

data/lib/generators/ruby_gallery/orm_helpers.rb

@@ -39,6 +39,8 @@ CONTENT
       def controller_path
         @controller_path ||= File.join("app", "controllers", "#{table_name}_controller.rb")
       end
+      
+      
     end
   end
 end

data/ruby_gallery.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby_gallery"
-  s.version = "0.2.2"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Dang"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_gallery
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -212,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4468700967218839458
+      hash: 2270418184149514019
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: