public this repo is viewable by everyone
Fork of halorgium/mephisto
Description: A mirror of the mephisto code-base
Homepage: http://mephistoblog.com/
Clone URL: git://github.com/technoweenie/mephisto.git
Click here to lend your support to: mephisto and make a donation at www.pledgie.com !
Merge commit 'floppy/master'
rick (author)
6 days ago
commit  aa50252c19b28969e3bc217e70bed6a2f16d3a78
tree    00e55ac84e45ff7c913a24226bb14385647a65ef
parent  42a9c9a97ac3a61a5d031a11bab598c3585969b5 parent  0ca6f9a34bc9e23cd1f882426d29b887a59b6be9
...
1
2
 
3
4
5
...
1
 
2
3
4
5
0
@@ -1,5 +1,5 @@
0
 class AssetDrop < BaseDrop
0
- liquid_attributes.push(*[:content_type, :size, :filename, :width, :height])
0
+ liquid_attributes.push(*[:content_type, :size, :filename, :width, :height, :title])
0
 
0
   [:image, :movie, :audio, :other, :pdf].each do |content|
0
     define_method("is_#{content}") { @source.send("#{content}?") }
...
6
7
8
 
 
9
10
11
...
16
17
18
19
20
 
...
6
7
8
9
10
11
12
13
...
18
19
20
 
21
22
0
@@ -6,6 +6,8 @@
0
 
0
   <%= error_messages_for :asset %>
0
   <dl class="group">
0
+ <dt><label for="asset_title">Title</label> <span class="hint">If you don't enter a title, we will use the filename instead.</span></dt>
0
+ <dd><%= f.text_field :title %></dd>
0
     <dt><label for="asset_tag">Tags</label> <span class="hint">Enter one or more tags separated by a comma or a space (for example, <em>"Web Dev" Tutorials</em> or <em>Web Dev, Tutorials</em>).</span></dt>
0
     <dd><%= f.text_field :tag %></dd>
0
     <dt><label for="asset_uploaded_data">Select a file</label></dt>
0
@@ -16,4 +18,4 @@
0
     <%= submit_tag 'Save Asset' %>
0
     or <%= link_to 'cancel', assets_path %>
0
   </p>
0
-<% end -%>
0
\ No newline at end of file
0
+<% end -%>

Comments

    No one has commented yet.