Skip to content
This repository
Browse code

css fixes, updated gems

  • Loading branch information...
commit b2b3fe0cbf76ec8465a2c449ad0364e10eb61ea3 1 parent 9d52158
Frederico Araujo authored

Showing 34 changed files with 73 additions and 37 deletions. Show diff stats Hide diff stats

  1. +6 0 CHANGELOG
  2. +10 8 Gemfile.lock
  3. +3 6 app/admin/item.rb
  4. +5 0 app/assets/stylesheets/active_admin.css.scss
  5. +16 0 app/assets/stylesheets/custom.css.scss
  6. +1 1  app/assets/stylesheets/font_control.sass
  7. +26 16 app/views/admin/items/_form.html.erb
  8. +1 1  ...active_admin-94fde01a6235f195b48b11dc1cae5b58.css → active_admin-319369986dc0798faf64f5ef193ab324.css}
  9. BIN  public/assets/active_admin-319369986dc0798faf64f5ef193ab324.css.gz
  10. BIN  public/assets/active_admin-94fde01a6235f195b48b11dc1cae5b58.css.gz
  11. BIN  public/assets/active_admin-cf45bae06391cb28801723bdf3660383.js.gz
  12. +1 1  public/assets/active_admin.css
  13. BIN  public/assets/active_admin.css.gz
  14. BIN  public/assets/active_admin.js.gz
  15. BIN  public/assets/active_admin/application-6ceda730647770889700c53523cc15ff.js.gz
  16. BIN  public/assets/active_admin/application.js.gz
  17. BIN  public/assets/active_admin/pages/application-f685456c48c9b6a91ce09c68f2821440.js.gz
  18. BIN  public/assets/active_admin/pages/application.js.gz
  19. BIN  public/assets/active_admin/print-d934cd71d0936f01793678816c4ff1b8.css.gz
  20. BIN  public/assets/active_admin/print.css.gz
  21. BIN  public/assets/application-27ff4f085b297cab09f0d8c5999e6aae.js.gz
  22. BIN  public/assets/application-934748781977b3424e1e91cecc4e95de.css.gz
  23. +1 1  .../{application-934748781977b3424e1e91cecc4e95de.css → application-fd82e3ced4f5480d43b9b4974df7e625.css}
  24. BIN  public/assets/application-fd82e3ced4f5480d43b9b4974df7e625.css.gz
  25. +1 1  public/assets/application.css
  26. BIN  public/assets/application.css.gz
  27. BIN  public/assets/application.js.gz
  28. +2 2 public/assets/manifest.yml
  29. BIN  public/assets/rss-5d88525bfa6012a6fe5cdf6dd949a96f.css.gz
  30. BIN  public/assets/rss.css.gz
  31. BIN  public/assets/tinymce-3a5968756d6bba8bea1b751efd89b1d9.css.gz
  32. BIN  public/assets/tinymce-fc793bc9587330b37f07f2b97745be71.js.gz
  33. BIN  public/assets/tinymce.css.gz
  34. BIN  public/assets/tinymce.js.gz
6 CHANGELOG
... ... @@ -1,5 +1,11 @@
1 1 CHANGELOG
2 2
  3 +== July 18, 2012
  4 +* Improved hints on new item form
  5 +* Minor CSS improvements for item
  6 +* Updated Sidekiq/Celluloid gems
  7 +* Updated Assets
  8 +
3 9 == July 17, 2012
4 10 * Updated Twitter Gem
5 11 * Moved SOLR to new instance
18 Gemfile.lock
@@ -64,10 +64,10 @@ GIT
64 64
65 65 GIT
66 66 remote: git://github.com/mperham/sidekiq.git
67   - revision: 169cdea2c8dd6a8e045bc1f5333eaade9babd95d
  67 + revision: 968ade3e6a3f77b43bdf326ca745766787c3a30a
68 68 specs:
69   - sidekiq (2.0.3)
70   - celluloid (~> 0.11.0)
  69 + sidekiq (2.0.4)
  70 + celluloid (~> 0.11.1)
71 71 connection_pool (~> 0.9.2)
72 72 multi_json (~> 1)
73 73 redis (~> 3)
@@ -75,11 +75,11 @@ GIT
75 75
76 76 GIT
77 77 remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
78   - revision: c55b4d330f45edf9f6e0593501004a9260b67249
  78 + revision: 34f760b116905e1a0295e3e4edea5240847a79c5
79 79 specs:
80   - twitter-bootstrap-rails (2.1.0)
  80 + twitter-bootstrap-rails (2.1.1)
81 81 actionpack (>= 3.1)
82   - less-rails (~> 2.2.2)
  82 + less-rails (~> 2.2.3)
83 83 railties (>= 3.1)
84 84 therubyracer (= 0.10.1)
85 85
@@ -153,7 +153,8 @@ GEM
153 153 carrierwave (0.6.2)
154 154 activemodel (>= 3.2.0)
155 155 activesupport (>= 3.2.0)
156   - celluloid (0.11.0)
  156 + celluloid (0.11.1)
  157 + timers (>= 1.0.0)
157 158 childprocess (0.3.3)
158 159 ffi (~> 1.0.6)
159 160 coderay (1.0.7)
@@ -388,7 +389,7 @@ GEM
388 389 rspec (~> 2.9.0)
389 390 ruby-hmac (0.4.0)
390 391 rubyzip (0.9.9)
391   - rvm-capistrano (1.2.3)
  392 + rvm-capistrano (1.2.5)
392 393 capistrano (>= 2.0.0)
393 394 sass (3.1.20)
394 395 sass-rails (3.2.5)
@@ -433,6 +434,7 @@ GEM
433 434 rack (>= 1.0.0)
434 435 thor (0.15.4)
435 436 tilt (1.3.3)
  437 + timers (1.0.1)
436 438 tinymce-rails (3.5.2)
437 439 railties (>= 3.1.1)
438 440 treetop (1.4.10)
9 app/admin/item.rb
@@ -108,8 +108,6 @@ def new
108 108 @item.published_at = nil
109 109 @item.expires_on = @now+10.years
110 110 @item.draft = true
111   - @item.author_name = current_admin_user.title
112   - @item.author_email = current_admin_user.email
113 111 @item.user_id = current_admin_user.id
114 112 end
115 113
@@ -175,9 +173,9 @@ def destroy
175 173 authorize! :destroy, @item
176 174 if (current_admin_user.has_any_role?(:admin,:editor,:security)) or (current_admin_user.id == @item.user_id)
177 175 @item.destroy
178   - flash[:notice]= "Item successfully deleted"
  176 + flash[:notice] = "Item successfully deleted"
179 177 else
180   - flash[:notice]= "You are not allowed to delete this Item"
  178 + flash[:notice] = "You are not allowed to delete this Item"
181 179 end
182 180 respond_to do |format|
183 181 format.html {redirect_to admin_items_path}
@@ -192,8 +190,7 @@ def correct_stale_record_version
192 190 end
193 191
194 192 def stale_record_recovery_action
195   - flash[:error] = "Error: Another user has updated this record "+
196   - "since you accessed the edit form."
  193 + flash[:error] = "Error: Another user has updated this record since you accessed the edit form."
197 194 render :edit, status: :conflict
198 195 end
199 196
5 app/assets/stylesheets/active_admin.css.scss
@@ -302,3 +302,8 @@ input.error {
302 302 margin-left: 10px;
303 303 width: 100px;
304 304 }
  305 +
  306 +p.inline-hints,
  307 +form fieldset > ol > li p.inline-hints {
  308 + font-size: 12px;
  309 +}
16 app/assets/stylesheets/custom.css.scss
@@ -126,6 +126,8 @@ article.category {
126 126 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
127 127 box-shadow: 0px 0px 3px #ccc;
128 128 }
  129 +
  130 +
129 131 article h1 {
130 132 letter-spacing: 1px;
131 133 font-size: 28px;
@@ -136,14 +138,20 @@ article h2 {
136 138 letter-spacing: 1px;
137 139 font-size: 24px;
138 140 color: #444;
  141 + margin-bottom: 12px;
  142 + margin-top: 12px;
139 143 }
140 144 article h3 {
141 145 font-size: 20px;
142 146 color: #333;
  147 + margin-bottom: 10px;
  148 + margin-top: 10px;
143 149 }
144 150 article h4 {
145 151 font-size: 14px;
146 152 color: #222;
  153 + margin-bottom: 7px;
  154 + margin-top: 7px;
147 155 }
148 156 article p img {
149 157 border: 1px solid #DDD;
@@ -276,6 +284,11 @@ article footer .share a {
276 284 margin-left: 4px;
277 285 }
278 286
  287 +article ol li,
  288 +article ul li {
  289 + margin-top: 5px;
  290 + margin-bottom: 5px;
  291 +}
279 292
280 293 .categories .box {
281 294 text-align:left;
@@ -538,3 +551,6 @@ span#item_body li {
538 551 color: #333;
539 552 }
540 553
  554 +iframe#html5_player {
  555 + margin-bottom: 15px;
  556 +}
2  app/assets/stylesheets/font_control.sass
@@ -5,7 +5,7 @@
5 5
6 6 a
7 7 font: bold 12px arial
8   - padding: 3px
  8 + padding: 3px 4px
9 9 border: solid 1px #ccc
10 10 border-radius: 3px
11 11
42 app/views/admin/items/_form.html.erb
@@ -11,7 +11,7 @@
11 11 %>
12 12 <%= f.input :language,
13 13 as: :select,
14   - member_label: 'description',
  14 + member_label: 'description',
15 15 member_value: :id,
16 16 label: "Language",
17 17 required: true,
@@ -32,25 +32,25 @@
32 32 label: "Main Content",
33 33 required: true,
34 34 input_html: { rows: 60, cols: 120},
35   - hint: "Do Not use H1 headings. Use only H2, H3 and H4. If you want a new paragraph, simply hit 'RETURN'. If you don’t want a new paragraph and just want a line break, hit 'SHIFT RETURN'. - If you are copying and pasting from a website, it is recommended to paste first to Notepad.exe/TextEdit.app then copy again to paste here."
  35 + hint: "Do Not use H1 headings. Use only H2, H3 and H4. If you want a new paragraph, simply hit 'RETURN' key. If you don’t want a new paragraph and just want a line break, hit 'SHIFT+RETURN' keys. - If you are copying and pasting from a website, it is recommended to paste first to Notepad.exe/TextEdit.app then copy again and paste here."
36 36 %>
37 37 <%= f.input :keywords,
38 38 label: "Keywords",
39 39 required: false,
40   - hint: "Keywords related to the article, such as names, events, special keywords, or any keyword that might have ralation to other articles. Examples: Jamahiriya, USA, Illuminati, Rockefeller, New World Order, Free Energy, Monsanto, GMO, IMF, Pepsi, Gold, banking, cocaine, etc... It will greatly improve discovery of related items. You may also use special keywords to relate other items. It's invisble to the users. Less keywords will give more related items but less accurate, more keywords will give less related items but more accurate. You need to find a good balance."
  40 + hint: "Keywords related to the article, such as names, events, special keywords, or any keyword with a ralationship to other articles. Examples: Jamahiriya, USA, Illuminati, Rockefeller, New World Order, Free Energy, Monsanto, GMO, IMF, Pepsi, Gold, banking, Wikileaks, Anonymous. It will improve discovery of related items. You may also use special keywords to relate other items. It's invisble to the users. Less keywords will give more related items but less accurate, more keywords will give less related items but more accurate. You need to find a good balance."
41 41 %>
42 42 <%= f.input :published_at,
43   - # value: f.object.published_at.localtime,
44 43 as: "string",
45 44 label: "Publication Date",
46 45 require: true,
47   - hint: "When to go live. Timezone used for picking date: '#{Time.zone}' (from your Profile). It will be converted to UTC after saving. (Required)"
  46 + hint: "Time to go live. Timezone used for picking date: '#{Time.zone}' from your Profile.
  47 + (Required)"
48 48 %>
49 49 <%= f.input :expires_on,
50 50 as: "string",
51 51 label: "Expire Date",
52 52 value: f.object.expires_on.localtime,
53   - hint: "Expiration date of article (default: 10 years). It will be converted to UTC after saving."
  53 + hint: "Expiration date of article (default: 10 years)."
54 54 %>
55 55 <% end %>
56 56
@@ -63,11 +63,11 @@
63 63 %>
64 64 <br />
65 65 <%= f.input :youtube_img, label: "Automatically Set Youtube Image",
66   - hint: "Automatically set main image from a youtube screenshot"
  66 + hint: "Automatically set main image from a youtube screenshot."
67 67 %>
68 68 <br />
69 69 <%= f.input :youtube_res, label: "Video Resolution",
70   - hint: "Set this if you have multiple youtube videos on the same page",
  70 + hint: "Set this if you have multiple youtube videos on the same page.",
71 71 as: :select,
72 72 collection: ["240x360", "360x480", "400x540", "480x720", "600x800"],
73 73 include_blank: "Automatically"
@@ -79,25 +79,26 @@
79 79 <%= f.inputs name: "Tags" do %>
80 80 <div class="medium_box">
81 81 <%= f.input :general_tags, as: :check_boxes, label: "General",
82   - collection: GeneralTag.find(:all, order: "title ASC")
  82 + collection: GeneralTag.find(:all, order: "title ASC"),
  83 + hint: "Select 2-4 tags, but no more than 6"
83 84 %>
84 85 </div>
85 86 <div class="medium_box">
86 87 <%= f.input :region_tags, as: :check_boxes, label: "Regional",
87   - collection: RegionTag.find(:all, order: "title ASC")
  88 + collection: RegionTag.find(:all, order: "title ASC")
88 89 %>
89 90 </div>
90 91 <div class="medium_box">
91 92 <%= f.input :country_tags, as: :check_boxes, label: "Countries",
92   - collection: CountryTag.find(:all, order: "title ASC")
  93 + collection: CountryTag.find(:all, order: "title ASC")
93 94 %>
94 95 </div>
95 96 <% end %>
96 97
97 98 <%= f.inputs name: "Author and Source" do %>
98   - <%= f.input :author_name, hint: "If blank, your 'Name' will be used" %>
  99 + <%= f.input :author_name, hint: "If blank, your 'Name' will be used", placeholder: "Original Author name" %>
99 100 <%= f.input :author_email %>
100   - <%= f.input :source_url, hint: "If you wrote the article, leave empty" %>
  101 + <%= f.input :source_url, hint: "If you wrote the article, leave empty", placeholder: "http://" %>
101 102 <%= f.input :original, label: "Original author", hint: "Are you the original Author of this article?" %>
102 103 <br />
103 104 <% end %>
@@ -117,6 +118,7 @@
117 118 <% if f.object.twitter_shares.empty? %>
118 119 <%= f.input :share_twitter, as: "boolean",
119 120 hint: "Auto post to twitter upon publication? Only set it if item is ready and not Draft. It can only be posted once. Performed 3 minutes after Publication." %>
  121 + <br />
120 122 <% else %>
121 123 <li class="boolean input optional">
122 124 <label><b>Already posted to twitter</b></label>
@@ -126,6 +128,7 @@
126 128 <% if !f.object.email_delivery_sent? %>
127 129 <%= f.input :send_emails, as: "boolean",
128 130 hint: "Send emails upon publication? Only set it if item is ready and not Draft. It can only be posted once. Email will be sent 3 minutes after Publication." %>
  131 + <br />
129 132 <% elsif f.object.email_delivery_sent? %>
130 133 <li class="boolean input optional">
131 134 <label><b>Already Sent Emails</b></label>
@@ -193,19 +196,26 @@
193 196 <br />
194 197 <%= f.input :existing_attachment_id,
195 198 as: "number",
  199 + placeholder: '12345',
196 200 input_html: {class: 'small'},
197   - hint: "Or enter ID of an existing image attachment"
  201 + hint: "Enter image ID for and existing image in the system"
198 202 %>
199 203 <% end %>
200 204
201 205 <%= f.inputs name: "Editor Notes" do %>
202 206 <%= f.input :author_status,
203 207 as: :select,
  208 + include_blank: "-- Article Status",
204 209 label: "Author Status",
205 210 collection: ["Ready to go", "Needs Editing", "Needs Translation", "Needs Image"]
206 211 %>
207   - <%= f.input :editor_notes, as: "text", input_html: {rows: 4} %>
208   - <%= f.input :updated_reason, as: "string", hint: "Provide a reason for editing, as short as possible, 2-4 words." %>
  212 + <%= f.input :editor_notes,
  213 + as: "text",
  214 + input_html: {rows: 4},
  215 + hint: "Your personal notes, or to other editors",
  216 + placeholder: "Your personal notes, or to other editors"
  217 + %>
  218 + <%= f.input :updated_reason, as: "string", hint: "Provide a reason for editing, 4-6 words." %>
209 219 <% end %>
210 220
211 221 <%= f.input :lock_version, as: :hidden %>
2  ...active_admin-94fde01a6235f195b48b11dc1cae5b58.css → ...active_admin-319369986dc0798faf64f5ef193ab324.css
1 addition, 1 deletion not shown
BIN  public/assets/active_admin-319369986dc0798faf64f5ef193ab324.css.gz
Binary file not shown
BIN  public/assets/active_admin-94fde01a6235f195b48b11dc1cae5b58.css.gz
Binary file not shown
BIN  public/assets/active_admin-cf45bae06391cb28801723bdf3660383.js.gz
Binary file not shown
2  public/assets/active_admin.css
1 addition, 1 deletion not shown
BIN  public/assets/active_admin.css.gz
Binary file not shown
BIN  public/assets/active_admin.js.gz
Binary file not shown
BIN  public/assets/active_admin/application-6ceda730647770889700c53523cc15ff.js.gz
Binary file not shown
BIN  public/assets/active_admin/application.js.gz
Binary file not shown
BIN  public/assets/active_admin/pages/application-f685456c48c9b6a91ce09c68f2821440.js.gz
Binary file not shown
BIN  public/assets/active_admin/pages/application.js.gz
Binary file not shown
BIN  public/assets/active_admin/print-d934cd71d0936f01793678816c4ff1b8.css.gz
Binary file not shown
BIN  public/assets/active_admin/print.css.gz
Binary file not shown
BIN  public/assets/application-27ff4f085b297cab09f0d8c5999e6aae.js.gz
Binary file not shown
BIN  public/assets/application-934748781977b3424e1e91cecc4e95de.css.gz
Binary file not shown
2  .../application-934748781977b3424e1e91cecc4e95de.css → .../application-fd82e3ced4f5480d43b9b4974df7e625.css
1 addition, 1 deletion not shown
BIN  public/assets/application-fd82e3ced4f5480d43b9b4974df7e625.css.gz
Binary file not shown
2  public/assets/application.css
1 addition, 1 deletion not shown
BIN  public/assets/application.css.gz
Binary file not shown
BIN  public/assets/application.js.gz
Binary file not shown
4 public/assets/manifest.yml
@@ -195,8 +195,8 @@ rss_icon_glass_blue64.png: rss_icon_glass_blue64-deed2260585ed3bb754b60d14154154
195 195 world_mathaba11.png: world_mathaba11-05570f0309b7b69f11ada4c845795333.png
196 196 active_admin.js: active_admin-cf45bae06391cb28801723bdf3660383.js
197 197 application.js: application-27ff4f085b297cab09f0d8c5999e6aae.js
198   -active_admin.css: active_admin-94fde01a6235f195b48b11dc1cae5b58.css
199   -application.css: application-934748781977b3424e1e91cecc4e95de.css
  198 +active_admin.css: active_admin-319369986dc0798faf64f5ef193ab324.css
  199 +application.css: application-fd82e3ced4f5480d43b9b4974df7e625.css
200 200 rss.css: rss-5d88525bfa6012a6fe5cdf6dd949a96f.css
201 201 jquery-ui/ui-bg_flat_0_bdbdbd_40x100.png: jquery-ui/ui-bg_flat_0_bdbdbd_40x100-3be6aa7b1d61a969928ed6aa55e3c7cc.png
202 202 jquery-ui/ui-bg_flat_0_eeeeee_40x100.png: jquery-ui/ui-bg_flat_0_eeeeee_40x100-054315d6c4bede256f2706ca7da722bd.png
BIN  public/assets/rss-5d88525bfa6012a6fe5cdf6dd949a96f.css.gz
Binary file not shown
BIN  public/assets/rss.css.gz
Binary file not shown
BIN  public/assets/tinymce-3a5968756d6bba8bea1b751efd89b1d9.css.gz
Binary file not shown
BIN  public/assets/tinymce-fc793bc9587330b37f07f2b97745be71.js.gz
Binary file not shown
BIN  public/assets/tinymce.css.gz
Binary file not shown
BIN  public/assets/tinymce.js.gz
Binary file not shown

0 comments on commit b2b3fe0

Please sign in to comment.
Something went wrong with that request. Please try again.