Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

css fixes, updated gems

  • Loading branch information...
commit b2b3fe0cbf76ec8465a2c449ad0364e10eb61ea3 1 parent 9d52158
@fred authored
Showing with 73 additions and 37 deletions.
  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
View
6 CHANGELOG
@@ -1,5 +1,11 @@
CHANGELOG
+== July 18, 2012
+* Improved hints on new item form
+* Minor CSS improvements for item
+* Updated Sidekiq/Celluloid gems
+* Updated Assets
+
== July 17, 2012
* Updated Twitter Gem
* Moved SOLR to new instance
View
18 Gemfile.lock
@@ -64,10 +64,10 @@ GIT
GIT
remote: git://github.com/mperham/sidekiq.git
- revision: 169cdea2c8dd6a8e045bc1f5333eaade9babd95d
+ revision: 968ade3e6a3f77b43bdf326ca745766787c3a30a
specs:
- sidekiq (2.0.3)
- celluloid (~> 0.11.0)
+ sidekiq (2.0.4)
+ celluloid (~> 0.11.1)
connection_pool (~> 0.9.2)
multi_json (~> 1)
redis (~> 3)
@@ -75,11 +75,11 @@ GIT
GIT
remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
- revision: c55b4d330f45edf9f6e0593501004a9260b67249
+ revision: 34f760b116905e1a0295e3e4edea5240847a79c5
specs:
- twitter-bootstrap-rails (2.1.0)
+ twitter-bootstrap-rails (2.1.1)
actionpack (>= 3.1)
- less-rails (~> 2.2.2)
+ less-rails (~> 2.2.3)
railties (>= 3.1)
therubyracer (= 0.10.1)
@@ -153,7 +153,8 @@ GEM
carrierwave (0.6.2)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
- celluloid (0.11.0)
+ celluloid (0.11.1)
+ timers (>= 1.0.0)
childprocess (0.3.3)
ffi (~> 1.0.6)
coderay (1.0.7)
@@ -388,7 +389,7 @@ GEM
rspec (~> 2.9.0)
ruby-hmac (0.4.0)
rubyzip (0.9.9)
- rvm-capistrano (1.2.3)
+ rvm-capistrano (1.2.5)
capistrano (>= 2.0.0)
sass (3.1.20)
sass-rails (3.2.5)
@@ -433,6 +434,7 @@ GEM
rack (>= 1.0.0)
thor (0.15.4)
tilt (1.3.3)
+ timers (1.0.1)
tinymce-rails (3.5.2)
railties (>= 3.1.1)
treetop (1.4.10)
View
9 app/admin/item.rb
@@ -108,8 +108,6 @@ def new
@item.published_at = nil
@item.expires_on = @now+10.years
@item.draft = true
- @item.author_name = current_admin_user.title
- @item.author_email = current_admin_user.email
@item.user_id = current_admin_user.id
end
@@ -175,9 +173,9 @@ def destroy
authorize! :destroy, @item
if (current_admin_user.has_any_role?(:admin,:editor,:security)) or (current_admin_user.id == @item.user_id)
@item.destroy
- flash[:notice]= "Item successfully deleted"
+ flash[:notice] = "Item successfully deleted"
else
- flash[:notice]= "You are not allowed to delete this Item"
+ flash[:notice] = "You are not allowed to delete this Item"
end
respond_to do |format|
format.html {redirect_to admin_items_path}
@@ -192,8 +190,7 @@ def correct_stale_record_version
end
def stale_record_recovery_action
- flash[:error] = "Error: Another user has updated this record "+
- "since you accessed the edit form."
+ flash[:error] = "Error: Another user has updated this record since you accessed the edit form."
render :edit, status: :conflict
end
View
5 app/assets/stylesheets/active_admin.css.scss
@@ -302,3 +302,8 @@ input.error {
margin-left: 10px;
width: 100px;
}
+
+p.inline-hints,
+form fieldset > ol > li p.inline-hints {
+ font-size: 12px;
+}
View
16 app/assets/stylesheets/custom.css.scss
@@ -126,6 +126,8 @@ article.category {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
box-shadow: 0px 0px 3px #ccc;
}
+
+
article h1 {
letter-spacing: 1px;
font-size: 28px;
@@ -136,14 +138,20 @@ article h2 {
letter-spacing: 1px;
font-size: 24px;
color: #444;
+ margin-bottom: 12px;
+ margin-top: 12px;
}
article h3 {
font-size: 20px;
color: #333;
+ margin-bottom: 10px;
+ margin-top: 10px;
}
article h4 {
font-size: 14px;
color: #222;
+ margin-bottom: 7px;
+ margin-top: 7px;
}
article p img {
border: 1px solid #DDD;
@@ -276,6 +284,11 @@ article footer .share a {
margin-left: 4px;
}
+article ol li,
+article ul li {
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
.categories .box {
text-align:left;
@@ -538,3 +551,6 @@ span#item_body li {
color: #333;
}
+iframe#html5_player {
+ margin-bottom: 15px;
+}
View
2  app/assets/stylesheets/font_control.sass
@@ -5,7 +5,7 @@
a
font: bold 12px arial
- padding: 3px
+ padding: 3px 4px
border: solid 1px #ccc
border-radius: 3px
View
42 app/views/admin/items/_form.html.erb
@@ -11,7 +11,7 @@
%>
<%= f.input :language,
as: :select,
- member_label: 'description',
+ member_label: 'description',
member_value: :id,
label: "Language",
required: true,
@@ -32,25 +32,25 @@
label: "Main Content",
required: true,
input_html: { rows: 60, cols: 120},
- 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."
+ 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."
%>
<%= f.input :keywords,
label: "Keywords",
required: false,
- 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."
+ 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."
%>
<%= f.input :published_at,
- # value: f.object.published_at.localtime,
as: "string",
label: "Publication Date",
require: true,
- hint: "When to go live. Timezone used for picking date: '#{Time.zone}' (from your Profile). It will be converted to UTC after saving. (Required)"
+ hint: "Time to go live. Timezone used for picking date: '#{Time.zone}' from your Profile.
+ (Required)"
%>
<%= f.input :expires_on,
as: "string",
label: "Expire Date",
value: f.object.expires_on.localtime,
- hint: "Expiration date of article (default: 10 years). It will be converted to UTC after saving."
+ hint: "Expiration date of article (default: 10 years)."
%>
<% end %>
@@ -63,11 +63,11 @@
%>
<br />
<%= f.input :youtube_img, label: "Automatically Set Youtube Image",
- hint: "Automatically set main image from a youtube screenshot"
+ hint: "Automatically set main image from a youtube screenshot."
%>
<br />
<%= f.input :youtube_res, label: "Video Resolution",
- hint: "Set this if you have multiple youtube videos on the same page",
+ hint: "Set this if you have multiple youtube videos on the same page.",
as: :select,
collection: ["240x360", "360x480", "400x540", "480x720", "600x800"],
include_blank: "Automatically"
@@ -79,25 +79,26 @@
<%= f.inputs name: "Tags" do %>
<div class="medium_box">
<%= f.input :general_tags, as: :check_boxes, label: "General",
- collection: GeneralTag.find(:all, order: "title ASC")
+ collection: GeneralTag.find(:all, order: "title ASC"),
+ hint: "Select 2-4 tags, but no more than 6"
%>
</div>
<div class="medium_box">
<%= f.input :region_tags, as: :check_boxes, label: "Regional",
- collection: RegionTag.find(:all, order: "title ASC")
+ collection: RegionTag.find(:all, order: "title ASC")
%>
</div>
<div class="medium_box">
<%= f.input :country_tags, as: :check_boxes, label: "Countries",
- collection: CountryTag.find(:all, order: "title ASC")
+ collection: CountryTag.find(:all, order: "title ASC")
%>
</div>
<% end %>
<%= f.inputs name: "Author and Source" do %>
- <%= f.input :author_name, hint: "If blank, your 'Name' will be used" %>
+ <%= f.input :author_name, hint: "If blank, your 'Name' will be used", placeholder: "Original Author name" %>
<%= f.input :author_email %>
- <%= f.input :source_url, hint: "If you wrote the article, leave empty" %>
+ <%= f.input :source_url, hint: "If you wrote the article, leave empty", placeholder: "http://" %>
<%= f.input :original, label: "Original author", hint: "Are you the original Author of this article?" %>
<br />
<% end %>
@@ -117,6 +118,7 @@
<% if f.object.twitter_shares.empty? %>
<%= f.input :share_twitter, as: "boolean",
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." %>
+ <br />
<% else %>
<li class="boolean input optional">
<label><b>Already posted to twitter</b></label>
@@ -126,6 +128,7 @@
<% if !f.object.email_delivery_sent? %>
<%= f.input :send_emails, as: "boolean",
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." %>
+ <br />
<% elsif f.object.email_delivery_sent? %>
<li class="boolean input optional">
<label><b>Already Sent Emails</b></label>
@@ -193,19 +196,26 @@
<br />
<%= f.input :existing_attachment_id,
as: "number",
+ placeholder: '12345',
input_html: {class: 'small'},
- hint: "Or enter ID of an existing image attachment"
+ hint: "Enter image ID for and existing image in the system"
%>
<% end %>
<%= f.inputs name: "Editor Notes" do %>
<%= f.input :author_status,
as: :select,
+ include_blank: "-- Article Status",
label: "Author Status",
collection: ["Ready to go", "Needs Editing", "Needs Translation", "Needs Image"]
%>
- <%= f.input :editor_notes, as: "text", input_html: {rows: 4} %>
- <%= f.input :updated_reason, as: "string", hint: "Provide a reason for editing, as short as possible, 2-4 words." %>
+ <%= f.input :editor_notes,
+ as: "text",
+ input_html: {rows: 4},
+ hint: "Your personal notes, or to other editors",
+ placeholder: "Your personal notes, or to other editors"
+ %>
+ <%= f.input :updated_reason, as: "string", hint: "Provide a reason for editing, 4-6 words." %>
<% end %>
<%= f.input :lock_version, as: :hidden %>
View
2  ...dmin-94fde01a6235f195b48b11dc1cae5b58.css → ...dmin-319369986dc0798faf64f5ef193ab324.css
1 addition, 1 deletion not shown
View
BIN  public/assets/active_admin-319369986dc0798faf64f5ef193ab324.css.gz
Binary file not shown
View
BIN  public/assets/active_admin-94fde01a6235f195b48b11dc1cae5b58.css.gz
Binary file not shown
View
BIN  public/assets/active_admin-cf45bae06391cb28801723bdf3660383.js.gz
Binary file not shown
View
2  public/assets/active_admin.css
1 addition, 1 deletion not shown
View
BIN  public/assets/active_admin.css.gz
Binary file not shown
View
BIN  public/assets/active_admin.js.gz
Binary file not shown
View
BIN  public/assets/active_admin/application-6ceda730647770889700c53523cc15ff.js.gz
Binary file not shown
View
BIN  public/assets/active_admin/application.js.gz
Binary file not shown
View
BIN  public/assets/active_admin/pages/application-f685456c48c9b6a91ce09c68f2821440.js.gz
Binary file not shown
View
BIN  public/assets/active_admin/pages/application.js.gz
Binary file not shown
View
BIN  public/assets/active_admin/print-d934cd71d0936f01793678816c4ff1b8.css.gz
Binary file not shown
View
BIN  public/assets/active_admin/print.css.gz
Binary file not shown
View
BIN  public/assets/application-27ff4f085b297cab09f0d8c5999e6aae.js.gz
Binary file not shown
View
BIN  public/assets/application-934748781977b3424e1e91cecc4e95de.css.gz
Binary file not shown
View
2  ...tion-934748781977b3424e1e91cecc4e95de.css → ...tion-fd82e3ced4f5480d43b9b4974df7e625.css
1 addition, 1 deletion not shown
View
BIN  public/assets/application-fd82e3ced4f5480d43b9b4974df7e625.css.gz
Binary file not shown
View
2  public/assets/application.css
1 addition, 1 deletion not shown
View
BIN  public/assets/application.css.gz
Binary file not shown
View
BIN  public/assets/application.js.gz
Binary file not shown
View
4 public/assets/manifest.yml
@@ -195,8 +195,8 @@ rss_icon_glass_blue64.png: rss_icon_glass_blue64-deed2260585ed3bb754b60d14154154
world_mathaba11.png: world_mathaba11-05570f0309b7b69f11ada4c845795333.png
active_admin.js: active_admin-cf45bae06391cb28801723bdf3660383.js
application.js: application-27ff4f085b297cab09f0d8c5999e6aae.js
-active_admin.css: active_admin-94fde01a6235f195b48b11dc1cae5b58.css
-application.css: application-934748781977b3424e1e91cecc4e95de.css
+active_admin.css: active_admin-319369986dc0798faf64f5ef193ab324.css
+application.css: application-fd82e3ced4f5480d43b9b4974df7e625.css
rss.css: rss-5d88525bfa6012a6fe5cdf6dd949a96f.css
jquery-ui/ui-bg_flat_0_bdbdbd_40x100.png: jquery-ui/ui-bg_flat_0_bdbdbd_40x100-3be6aa7b1d61a969928ed6aa55e3c7cc.png
jquery-ui/ui-bg_flat_0_eeeeee_40x100.png: jquery-ui/ui-bg_flat_0_eeeeee_40x100-054315d6c4bede256f2706ca7da722bd.png
View
BIN  public/assets/rss-5d88525bfa6012a6fe5cdf6dd949a96f.css.gz
Binary file not shown
View
BIN  public/assets/rss.css.gz
Binary file not shown
View
BIN  public/assets/tinymce-3a5968756d6bba8bea1b751efd89b1d9.css.gz
Binary file not shown
View
BIN  public/assets/tinymce-fc793bc9587330b37f07f2b97745be71.js.gz
Binary file not shown
View
BIN  public/assets/tinymce.css.gz
Binary file not shown
View
BIN  public/assets/tinymce.js.gz
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.