Mercurial > zeropaste
changeset 264:fa4a1ba990ae
Simplified pastes#show view.
author | edogawaconan <me@myconan.net> |
---|---|
date | Wed, 16 Oct 2013 02:19:36 +0900 |
parents | a9c45375a656 |
children | 6cca1ab53337 |
files | app/assets/javascripts/boot.js app/assets/javascripts/zp.emul_radio.js app/assets/javascripts/zp.hash_magic.js app/assets/stylesheets/pastes.css app/views/pastes/show.html.erb |
diffstat | 5 files changed, 25 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/app/assets/javascripts/boot.js Wed Oct 16 01:55:23 2013 +0900 +++ b/app/assets/javascripts/boot.js Wed Oct 16 02:19:36 2013 +0900 @@ -1,10 +1,8 @@ //= require zp.init -//= require zp.emul_radio //= require zp.formatter //= require zp.hash_magic //= require zp.new $(document).ready(function() { - zp.emul_radio.init() zp.formatter.init() zp.hash_magic.init() zp.new.init()
--- a/app/assets/javascripts/zp.emul_radio.js Wed Oct 16 01:55:23 2013 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -(function($) { - window.zp.emul_radio = { - do_switch: function(e) { - $(e.target).siblings().removeClass("active") - }, - init: function() { - $(".emul-radio > a").click(this.do_switch) - } - } -})(jQuery)
--- a/app/assets/javascripts/zp.hash_magic.js Wed Oct 16 01:55:23 2013 +0900 +++ b/app/assets/javascripts/zp.hash_magic.js Wed Oct 16 02:19:36 2013 +0900 @@ -3,9 +3,8 @@ window.zp.hash_magic = { load_hash: function() { var format = window.location.hash.slice(1) - if (format !== undefined) { - zp.formatter.links().filter("[href=#" + format + "]").click() - } + if (format == "") format = "pl" + zp.formatter.links().filter("[href=#" + format + "]").tab('show') }, set_hash: function(e) { if (typeof e !== "undefined") {
--- a/app/assets/stylesheets/pastes.css Wed Oct 16 01:55:23 2013 +0900 +++ b/app/assets/stylesheets/pastes.css Wed Oct 16 02:19:36 2013 +0900 @@ -9,3 +9,9 @@ #pl > pre { word-break: normal; } + +#paste-show > div, +#paste-show > ul, +.edit_paste { + margin-bottom: 20px; +}
--- a/app/views/pastes/show.html.erb Wed Oct 16 01:55:23 2013 +0900 +++ b/app/views/pastes/show.html.erb Wed Oct 16 02:19:36 2013 +0900 @@ -11,16 +11,13 @@ </div> <div id="paste-show" data-id="<%= @paste.id %>"> - <div class="row"><div class="col-lg-12"> - <div class="btn-toolbar"> - <div id="paste-mode" class="btn-group emul-radio" data-toggle="buttons"> - <%= link_to 'Plain', '#pl', :data => { :toggle => 'tab' }, :class => 'btn btn-default active' %> - <%= link_to 'Highlight', '#hl', :data => { :toggle => 'tab' }, :class => 'btn btn-default' %> - <%= link_to 'Markdown', '#md', :data => { :toggle => 'tab' }, :class => 'btn btn-default' %> - </div> - </div> - </div></div> - <div class="row"><div id="paste" class="col-lg-12 tab-content"> + <ul id="paste-mode" class="nav nav-tabs"> + <li><%= link_to 'Plain', '#pl', :data => { :toggle => 'pill' } %></li> + <li><%= link_to 'Highlight', '#hl', :data => { :toggle => 'pill' } %></li> + <li><%= link_to 'Markdown', '#md', :data => { :toggle => 'pill' } %></li> + </ul> + + <div id="paste" class="tab-content"> <div class="tab-pane active" id="pl"> <pre><%= @paste.paste %></pre> </div> @@ -30,24 +27,22 @@ <div class="tab-pane" id="md"> <div class="well"></div> </div> - </div></div> + </div> </div> -<div class="row"><div class="col-md-4"> - <%= form_for @paste, :method => :delete do |f| %> +<%= form_for @paste, :method => :delete do |f| %> + <div class="row"><div class="col-md-4"> <div class="input-group"> <%= f.text_field :key, :value => nil, :placeholder => 'Deletion key', :class => "form-control", :autofocus => !flash[:error].blank? %> <span class="input-group-btn"> <%= f.submit 'Delete this paste', :class => 'btn btn-danger' %> </span> </div> - <% end %> -</div></div> + </div></div> +<% end %> -<div> - <ul class="nav nav-pills"> - <li><%= link_to 'Raw', paste_path(@paste, :txt) %></li> - <li><%= link_to 'New paste based on this', root_path(:base => @paste) %></li> - <li><%= link_to 'More Paste', root_path %></li> - </ul> -</div> +<ul class="nav nav-pills"> + <li><%= link_to 'Raw', paste_path(@paste, :txt) %></li> + <li><%= link_to 'Derive', root_path(:base => @paste) %></li> + <li><%= link_to 'More Paste', root_path %></li> +</ul>