Permalink
Browse files

user can upload images

  • Loading branch information...
1 parent 9ee37a5 commit 2040bf398c4e0729e98e81990f6d19fe5ee0bc8e @inakidelamadrid inakidelamadrid committed Mar 16, 2012
View
@@ -33,7 +33,7 @@ GIT
GIT
remote: git://github.com/tangosource/magazine.git
- revision: 50ea9f6cd84cc4572be51b7860d1c7a18299a801
+ revision: e061e7c5005b06dc6fc2113f70cfae8bafa540f1
specs:
magazine (0.4.7)
RedCloth (>= 4.2.9)
@@ -0,0 +1,9 @@
+class AddRandomStringToImages < ActiveRecord::Migration
+ def self.up
+ add_column :images, :random_string, :string
+ end
+
+ def self.down
+ remove_column :images, :random_string
+ end
+end
@@ -0,0 +1,11 @@
+class AddNameAndAltNameToImages < ActiveRecord::Migration
+ def self.up
+ add_column :images, :name, :string
+ add_column :images, :alt_name, :string
+ end
+
+ def self.down
+ remove_column :images, :name
+ remove_column :images, :alt_name
+ end
+end
@@ -0,0 +1,9 @@
+class AddDefaultImageToImages < ActiveRecord::Migration
+ def self.up
+ add_column :images, :is_default_image, :boolean
+ end
+
+ def self.down
+ remove_column :images, :is_default_image
+ end
+end
View
@@ -10,7 +10,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120303002003221311) do
+ActiveRecord::Schema.define(:version => 20120316195419557632) do
create_table "account_deletions", :force => true do |t|
t.string "diaspora_handle"
@@ -169,10 +169,14 @@
end
create_table "images", :force => true do |t|
- t.integer "article_id", :null => false
- t.string "file", :null => false
+ t.integer "article_id", :null => false
+ t.string "file", :null => false
t.datetime "created_at"
t.datetime "updated_at"
+ t.string "random_string"
+ t.string "name"
+ t.string "alt_name"
+ t.boolean "is_default_image"
end
create_table "invitations", :force => true do |t|
@@ -3401,3 +3401,54 @@ ul.destinations {
label{
position: relative;}
}
+
+.article_form_existing_image_fields, .article_form_new_image_fields{
+ margin-bottom: 50px;
+}
+
+.article_form_existing_image_fields{
+
+ input[type='checkbox'], label{
+ display: inline-block !important;
+ }
+}
+
+.article_form_new_image_fields{
+
+ .image_file_fields{
+ width: 100%;
+ display: block;
+
+ label{
+ width: 20%;
+ }
+
+ input{
+ width: 70% !important;
+ }
+
+ input, label{
+ float: left;
+ }
+ }
+
+ .image_names{
+ width: 71%;
+ display: block;
+ margin-left: 182px;
+
+ label{
+ width: 20%;
+ }
+
+ input{
+ width: 78% !important;
+ }
+
+ input, label{
+ float: left;
+ }
+ }
+}
+
+

0 comments on commit 2040bf3

Please sign in to comment.