diff options
| author | luuduong <luuduong@gmail.com> | 2013-02-22 23:20:00 -0700 |
|---|---|---|
| committer | luuduong <luuduong@gmail.com> | 2013-02-22 23:20:00 -0700 |
| commit | aefc8fce16dc7e866edf80334a0f66a24f00c2aa (patch) | |
| tree | dc9eaec2146d244f85dada250ba830c6470aa17c /app | |
| parent | 4ca5ae03ab0bef3874e5141cbb0f2b11bdad547a (diff) | |
ran rake assest precompile and changed some labels on creations and layouts
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/custom.css.scss | 1 | ||||
| -rw-r--r-- | app/views/creations/_form.html.erb | 21 | ||||
| -rw-r--r-- | app/views/layouts/_header.html.erb | 2 | ||||
| -rw-r--r-- | app/views/tutorials/_form.html.erb | 2 |
4 files changed, 16 insertions, 10 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index 93c6427b..1f716979 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -38,6 +38,7 @@ footer #footer-floor { /** marketing value statements **/ .marketing { margin-bottom: 20px; + margin-top: 30px; background: url("/assets/linen-light-blue.jpg") repeat scroll left top transparent; border-bottom: 1px solid #BFD0E1; border-top: 1px solid #BFD0E1; diff --git a/app/views/creations/_form.html.erb b/app/views/creations/_form.html.erb index 0bf18d7a..b2af6e7a 100644 --- a/app/views/creations/_form.html.erb +++ b/app/views/creations/_form.html.erb @@ -48,21 +48,26 @@ </div> </div> <div class="control-group"> - <div class="controls"> - <label class="checkbox"> - <%= f.check_box :is_restricted, :class =>"input-xxlarge" %> - This creation probably should not be shown to kids. - </label> - </div> - </div> - <div class="control-group"> <label for="tags" class="control-label">Tags</label> + <div class="controls"> <% if @creation.present? %> <input name="creation_tags" type="text" id="tags" value="<% @creation.tags.map(&:name).each { |item| %><%= item %>,<% } %>" class="input-xxlarge" autocomplete="off" /> + <p class="help-block"> + <strong>Note:</strong> Help people find this creation by adding some keyword tags. + </p> <% else %> <input name="creation_tags" type="text" id="tags" value="" class="input-xxlarge" autocomplete="off" /> <% end %> </div> + </div> + <div class="control-group"> + <div class="controls"> + <label class="checkbox"> + <%= f.check_box :is_restricted, :class =>"input-xxlarge" %> + This creation probably should not be shown to kids. + </label> + </div> + </div> <div class="form-actions"> <button type="submit" class="btn btn-primary">NEXT STEP</button> <a href="<%= url_for @creation %>" class="btn">Cancel</a> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 629e618e..da2b1fbe 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -9,7 +9,7 @@ <a class="brand" style="color:hotpink;" href="/">Cake<em>Side</em></a> <div class="nav-collapse"> <%= form_tag(search_index_path, :method => "get", :name => "search", :class => "navbar-search pull-left") do %> - <input name="q" type="text" class="search-query" placeholder="Search" /> + <input name="q" type="text" class="search-query" placeholder="Search all content" /> <% end %> <ul class="nav"> <li><%= link_to 'Artists', profiles_path %></li> diff --git a/app/views/tutorials/_form.html.erb b/app/views/tutorials/_form.html.erb index 7634e03c..d7ac7672 100644 --- a/app/views/tutorials/_form.html.erb +++ b/app/views/tutorials/_form.html.erb @@ -13,7 +13,7 @@ $(function(){ <%= form_for(@tutorial, :html => {:class => "form-horizontal"}) do |f| %> <fieldset> <div class="control-group"> - <%= f.label :url, :class => "control-label" %> + <%= f.label :url, "Tutorial URL", :class => "control-label" %> <div class="controls"> <%= f.text_field :url, :class => "input-xxlarge", :placeholder => "Enter the full website link and click outside this box" %> </div> |
