forked from OpenNeo/impress
basic tip functionality
This commit is contained in:
parent
7e73313d43
commit
8fc156833f
8 changed files with 74 additions and 10 deletions
|
@ -1077,7 +1077,7 @@ View.ReportBrokenImage = function (wardrobe) {
|
|||
|
||||
View.Search = function (wardrobe) {
|
||||
var form = $('form.item-search'),
|
||||
item_set = new Partial.ItemSet(wardrobe, '#preview-search-basic ul'),
|
||||
item_set = new Partial.ItemSet(wardrobe, '#preview-search-results'),
|
||||
input_el = form.find('input[name=query]'),
|
||||
clear_el = $('#preview-search-form-clear'),
|
||||
error_el = $('#preview-search-form-error'),
|
||||
|
@ -1360,6 +1360,13 @@ View.PrankColorMessage = function(wardrobe) {
|
|||
});
|
||||
}
|
||||
|
||||
View.Tips = function() {
|
||||
var wrapper = $('#tips');
|
||||
var children = wrapper.children();
|
||||
var index = Math.floor(Math.random() * children.length);
|
||||
children.eq(index).show();
|
||||
}
|
||||
|
||||
var userbar_sessions_link = $('#userbar a:last');
|
||||
var userbar_message_el = $('#userbar-session-message').prependTo('#userbar');
|
||||
|
||||
|
|
|
@ -253,11 +253,17 @@ body.outfits-edit
|
|||
display: none
|
||||
#preview-search-advanced
|
||||
display: block
|
||||
#preview-search-basic > ul
|
||||
&.has-results
|
||||
#tips
|
||||
display: none
|
||||
#preview-search-basic-main
|
||||
clear: both
|
||||
#preview-search-basic > ul, #preview-search-advanced-main
|
||||
#preview-search-basic-main, #preview-search-advanced-main
|
||||
/* don't bounce the header around kthx */
|
||||
min-height: 180px
|
||||
#tips
|
||||
li
|
||||
display: none
|
||||
#preview-search-advanced
|
||||
display: none
|
||||
|
||||
|
|
|
@ -182,9 +182,13 @@ module ApplicationHelper
|
|||
def title(value)
|
||||
content_for :title, value
|
||||
end
|
||||
|
||||
def md(text)
|
||||
RDiscount.new(text).to_html.html_safe
|
||||
end
|
||||
|
||||
def translate_markdown(key, options={})
|
||||
RDiscount.new(translate("#{key}_markdown", options)).to_html.html_safe
|
||||
md translate("#{key}_markdown", options)
|
||||
end
|
||||
|
||||
alias_method :tmd, :translate_markdown
|
||||
|
|
5
app/models/wardrobe_tip.rb
Normal file
5
app/models/wardrobe_tip.rb
Normal file
|
@ -0,0 +1,5 @@
|
|||
class WardrobeTip < ActiveRecord::Base
|
||||
translates :body
|
||||
|
||||
scope :by_index, order('`index` ASC')
|
||||
end
|
|
@ -101,11 +101,17 @@
|
|||
%a#preview-search-advanced-link{href: 'javascript:void(0)'}= t '.search.advanced.header'
|
||||
%a#preview-search-form-clear{:href => "#"}= t '.search.form.clear'
|
||||
#preview-search-form-pagination
|
||||
#preview-search-form-loading= t '.search.loading'
|
||||
#preview-search-form-error.possible-error
|
||||
#preview-search-form-no-results
|
||||
= t '.search.no_results_html', :query => content_tag(:span)
|
||||
%ul
|
||||
#preview-search-basic-main
|
||||
#preview-search-form-loading= t '.search.loading'
|
||||
#preview-search-form-error.possible-error
|
||||
#preview-search-form-no-results
|
||||
= t '.search.no_results_html', :query => content_tag(:span)
|
||||
%ul#preview-search-results
|
||||
%ul#tips
|
||||
- WardrobeTip.by_index.each do |tip|
|
||||
%li
|
||||
%h3 Did you know?
|
||||
%div= md tip.body
|
||||
%form#preview-search-advanced
|
||||
%header
|
||||
%h2= t '.search.advanced.header'
|
||||
|
|
14
db/migrate/20140403034558_create_wardrobe_tips.rb
Normal file
14
db/migrate/20140403034558_create_wardrobe_tips.rb
Normal file
|
@ -0,0 +1,14 @@
|
|||
class CreateWardrobeTips < ActiveRecord::Migration
|
||||
def up
|
||||
create_table :wardrobe_tips do |t|
|
||||
t.integer :index, null: false
|
||||
t.timestamps
|
||||
end
|
||||
WardrobeTip.create_translation_table! body: :text
|
||||
end
|
||||
|
||||
def down
|
||||
drop_table :wardrobe_tips
|
||||
WardrobeTip.drop_translation_table!
|
||||
end
|
||||
end
|
19
db/schema.rb
19
db/schema.rb
|
@ -11,7 +11,7 @@
|
|||
#
|
||||
# It's strongly recommended to check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(:version => 20140331034031) do
|
||||
ActiveRecord::Schema.define(:version => 20140403034558) do
|
||||
|
||||
create_table "auth_servers", :force => true do |t|
|
||||
t.string "short_name", :limit => 10, :null => false
|
||||
|
@ -333,6 +333,23 @@ ActiveRecord::Schema.define(:version => 20140331034031) do
|
|||
t.integer "contact_neopets_connection_id"
|
||||
end
|
||||
|
||||
create_table "wardrobe_tip_translations", :force => true do |t|
|
||||
t.integer "wardrobe_tip_id"
|
||||
t.string "locale"
|
||||
t.text "body"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
end
|
||||
|
||||
add_index "wardrobe_tip_translations", ["locale"], :name => "index_wardrobe_tip_translations_on_locale"
|
||||
add_index "wardrobe_tip_translations", ["wardrobe_tip_id"], :name => "index_wardrobe_tip_translations_on_wardrobe_tip_id"
|
||||
|
||||
create_table "wardrobe_tips", :force => true do |t|
|
||||
t.integer "index", :null => false
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
end
|
||||
|
||||
create_table "zone_translations", :force => true do |t|
|
||||
t.integer "zone_id"
|
||||
t.string "locale"
|
||||
|
|
5
spec/models/wardrobe_tip_spec.rb
Normal file
5
spec/models/wardrobe_tip_spec.rb
Normal file
|
@ -0,0 +1,5 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe WardrobeTip do
|
||||
pending "add some examples to (or delete) #{__FILE__}"
|
||||
end
|
Loading…
Reference in a new issue