Commit 3ccd8e08 by tady

Merge pull request #92 from tadyjp/fix_post_page

[Review] post周辺のUX改善
parents 0aeed735 b9b0b497
GIT
remote: git://github.com/amatsuda/kaminari.git
revision: 3cfffc11be813ddca9311d3b3e2f1e74bc5ca347
revision: 21ad994d42527fd97c8168b0d0ccdd88cec91251
specs:
kaminari (0.15.1)
actionpack (>= 3.0.0)
......@@ -47,7 +47,7 @@ GEM
addressable (2.3.6)
ancestry (2.1.0)
activerecord (>= 3.0.0)
annotate (2.6.3)
annotate (2.6.5)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
arel (5.0.1.20140414130214)
......@@ -61,7 +61,7 @@ GEM
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
breadcrumble (4.0.0)
breadcrumble (4.1.0)
rails (>= 4.0.0)
builder (3.2.2)
capistrano (3.2.1)
......@@ -77,7 +77,7 @@ GEM
capistrano-rbenv (2.0.2)
capistrano (~> 3.1)
sshkit (~> 1.3)
capybara (2.2.1)
capybara (2.4.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
......@@ -85,9 +85,6 @@ GEM
xpath (~> 2.0)
celluloid (0.15.2)
timers (~> 1.1.0)
celluloid-io (0.15.0)
celluloid (>= 0.15.0)
nio4r (>= 0.5.0)
cliver (0.3.2)
coderay (1.1.0)
coffee-rails (4.0.1)
......@@ -97,6 +94,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
colorize (0.7.3)
coveralls (0.7.0)
multi_json (~> 1.3)
rest-client
......@@ -106,7 +104,7 @@ GEM
css_parser (1.3.5)
addressable
daemons (1.1.9)
database_rewinder (0.1.0)
database_rewinder (0.2.0)
debug_inspector (0.0.2)
devise (3.2.4)
bcrypt (~> 3.0)
......@@ -118,17 +116,17 @@ GEM
devise (>= 3.0.0.rc)
rails (>= 4.0.0.rc1)
diff-lcs (1.2.5)
docile (1.1.3)
domain_name (0.5.18)
docile (1.1.5)
domain_name (0.5.19)
unf (>= 0.0.5, < 1.0.0)
draper (1.3.0)
draper (1.3.1)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
request_store (~> 1.0.3)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
execjs (2.2.1)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
......@@ -137,7 +135,7 @@ GEM
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.3)
formatador (0.2.4)
formatador (0.2.5)
gherkin (2.12.2)
multi_json (~> 1.3)
github-markdown (0.6.5)
......@@ -149,7 +147,7 @@ GEM
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-rspec (4.2.8)
guard-rspec (4.2.10)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
guard-rubocop (1.1.0)
......@@ -158,19 +156,19 @@ GEM
guard-teaspoon (0.0.4)
guard (>= 1.6.1)
teaspoon (>= 0.5.3)
hashie (2.1.1)
hashie (3.1.0)
hike (1.2.3)
htmlentities (4.3.1)
htmlentities (4.3.2)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.6.9)
i18n (0.6.11)
i18n_generators (1.2.1)
mechanize
rails (>= 3.0.0)
jbuilder (2.0.7)
jbuilder (2.1.2)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (3.1.0)
jquery-rails (3.1.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
......@@ -179,12 +177,11 @@ GEM
launchy (2.4.2)
addressable (~> 2.3)
libv8 (3.16.14.3)
listen (2.7.4)
listen (2.7.9)
celluloid (>= 0.15.2)
celluloid-io (>= 0.15.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.5)
lumberjack (1.0.9)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
......@@ -199,21 +196,21 @@ GEM
webrobots (>= 0.0.9, < 0.2)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.3)
minitest (5.3.3)
multi_json (1.10.0)
mini_portile (0.6.0)
minitest (5.4.0)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
mysql2 (0.3.15)
mysql2 (0.3.16)
net-http-digest_auth (1.4)
net-http-persistent (2.9.4)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.0)
newrelic_rpm (3.8.0.218)
nio4r (1.0.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
net-ssh (2.9.1)
netrc (0.7.7)
newrelic_rpm (3.9.0.229)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
ntlm-http (0.1.1)
oauth (0.4.7)
oauth2 (0.9.3)
......@@ -222,11 +219,11 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
omniauth (1.2.1)
hashie (>= 1.2, < 3)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)
omniauth-google-oauth2 (0.2.4)
omniauth (~> 1.0)
omniauth-google-oauth2 (0.2.5)
omniauth (> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.1.2)
faraday (>= 0.8, < 0.10)
......@@ -234,30 +231,30 @@ GEM
oauth2 (~> 0.9.3)
omniauth (~> 1.2)
orm_adapter (0.5.0)
paper_trail (3.0.1)
paper_trail (3.0.3)
activerecord (>= 3.0, < 5.0)
activesupport (>= 3.0, < 5.0)
parser (2.1.9)
parser (2.2.0.pre.3)
ast (>= 1.1, < 3.0)
slop (~> 3.4, >= 3.4.5)
poltergeist (1.5.0)
poltergeist (1.5.1)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
polyglot (0.3.4)
polyglot (0.3.5)
powerpack (0.0.9)
premailer (1.8.2)
css_parser (>= 1.3.5)
htmlentities (>= 4.0.0)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
pry (0.10.0)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.2)
pry (>= 0.9.10)
rack (1.5.2)
rack-mini-profiler (0.9.1)
rack-mini-profiler (0.9.2)
rack (>= 1.1.3)
rack-test (0.6.2)
rack (>= 1.0)
......@@ -277,40 +274,45 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rake (10.3.1)
rake (10.3.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdoc (4.1.1)
json (~> 1.4)
ref (1.0.5)
request_store (1.0.5)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.6)
rspec-rails (2.14.2)
request_store (1.0.6)
rest-client (1.7.1)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec (3.0.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-core (3.0.2)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.2)
rspec-support (~> 3.0.0)
rspec-rails (3.0.1)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rubocop (0.21.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.2)
rubocop (0.24.1)
json (>= 1.7.7, < 2)
parser (~> 2.1.9)
parser (>= 2.2.0.pre.3, < 3.0)
powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-progressbar (1.4.2)
sass (3.3.7)
ruby-progressbar (1.5.1)
sass (3.3.9)
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
......@@ -324,7 +326,7 @@ GEM
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slim (2.0.2)
slim (2.0.3)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slop (3.5.0)
......@@ -337,13 +339,13 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sshkit (1.4.0)
sshkit (1.5.1)
colorize
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
term-ansicolor
teaspoon (0.8.0)
railties (>= 3.2.5, < 5)
temple (0.6.7)
temple (0.6.8)
term-ansicolor (1.3.0)
tins (~> 1.0)
therubyracer (0.12.1)
......@@ -354,19 +356,19 @@ GEM
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.19.1)
thread_safe (0.3.3)
thread_safe (0.3.4)
tilt (1.4.1)
timers (1.1.0)
tins (1.1.0)
tins (1.3.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turnip (1.2.1)
gherkin (>= 2.5)
rspec (>= 2.0, < 4.0)
tzinfo (1.1.0)
tzinfo (1.2.1)
thread_safe (~> 0.1)
uglifier (2.5.0)
uglifier (2.5.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
......@@ -376,7 +378,7 @@ GEM
warden (1.2.3)
rack (>= 1.0)
webrobots (0.1.1)
websocket-driver (0.3.3)
websocket-driver (0.3.4)
xpath (2.0.0)
nokogiri (~> 1.3)
......
......@@ -23,7 +23,7 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation"
li
form
a.btn.btn-primary.navbar-btn href=new_post_path
| Post&nbsp;&nbsp;
| New Post&nbsp;&nbsp;
span.glyphicon.glyphicon-pencil
li.dropdown
a.dropdown-toggle data-toggle="dropdown"
......
......@@ -67,7 +67,7 @@ input#fileupload data-url="/apis/file_receiver" multiple="" name="files[]" style
- content_for :footer_js do
javascript:
// $.setConfirmUnload();
$.setConfirmUnload();
$('#post-form').mod_mdEditor({end_point: '/apis/markdown_preview'});
......
......@@ -8,8 +8,7 @@ a.list-group-item.post-list.mod-hover-hidden data-post-id=post.id href=post_path
h4.text-link #{post.title}
.col-xs-3
span.label.label-danger = post.display_specified_date if post.specified_date
small.pull-right
##{post.id}
small.pull-right "##{post.id}"
.row
.col-xs-8
small.text-success
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment