Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
rendezvous
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VeNtura
rendezvous
Commits
b9b0b497
Commit
b9b0b497
authored
Jul 10, 2014
by
tady
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
post周辺のUX改善
parent
0aeed735
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
79 additions
and
78 deletions
+79
-78
Gemfile.lock
+76
-74
app/views/partials/_app_header.html.slim
+1
-1
app/views/posts/_form.html.slim
+1
-1
app/views/posts/_large_item.html.slim
+1
-2
No files found.
Gemfile.lock
View file @
b9b0b497
GIT
GIT
remote: git://github.com/amatsuda/kaminari.git
remote: git://github.com/amatsuda/kaminari.git
revision:
3cfffc11be813ddca9311d3b3e2f1e74bc5ca347
revision:
21ad994d42527fd97c8168b0d0ccdd88cec91251
specs:
specs:
kaminari (0.15.1)
kaminari (0.15.1)
actionpack (>= 3.0.0)
actionpack (>= 3.0.0)
...
@@ -47,7 +47,7 @@ GEM
...
@@ -47,7 +47,7 @@ GEM
addressable (2.3.6)
addressable (2.3.6)
ancestry (2.1.0)
ancestry (2.1.0)
activerecord (>= 3.0.0)
activerecord (>= 3.0.0)
annotate (2.6.
3
)
annotate (2.6.
5
)
activerecord (>= 2.3.0)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
rake (>= 0.8.7)
arel (5.0.1.20140414130214)
arel (5.0.1.20140414130214)
...
@@ -61,7 +61,7 @@ GEM
...
@@ -61,7 +61,7 @@ GEM
erubis (>= 2.6.6)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
debug_inspector (>= 0.0.1)
breadcrumble (4.
0
.0)
breadcrumble (4.
1
.0)
rails (>= 4.0.0)
rails (>= 4.0.0)
builder (3.2.2)
builder (3.2.2)
capistrano (3.2.1)
capistrano (3.2.1)
...
@@ -77,7 +77,7 @@ GEM
...
@@ -77,7 +77,7 @@ GEM
capistrano-rbenv (2.0.2)
capistrano-rbenv (2.0.2)
capistrano (~> 3.1)
capistrano (~> 3.1)
sshkit (~> 1.3)
sshkit (~> 1.3)
capybara (2.
2
.1)
capybara (2.
4
.1)
mime-types (>= 1.16)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack (>= 1.0.0)
...
@@ -85,9 +85,6 @@ GEM
...
@@ -85,9 +85,6 @@ GEM
xpath (~> 2.0)
xpath (~> 2.0)
celluloid (0.15.2)
celluloid (0.15.2)
timers (~> 1.1.0)
timers (~> 1.1.0)
celluloid-io (0.15.0)
celluloid (>= 0.15.0)
nio4r (>= 0.5.0)
cliver (0.3.2)
cliver (0.3.2)
coderay (1.1.0)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-rails (4.0.1)
...
@@ -97,6 +94,7 @@ GEM
...
@@ -97,6 +94,7 @@ GEM
coffee-script-source
coffee-script-source
execjs
execjs
coffee-script-source (1.7.0)
coffee-script-source (1.7.0)
colorize (0.7.3)
coveralls (0.7.0)
coveralls (0.7.0)
multi_json (~> 1.3)
multi_json (~> 1.3)
rest-client
rest-client
...
@@ -106,7 +104,7 @@ GEM
...
@@ -106,7 +104,7 @@ GEM
css_parser (1.3.5)
css_parser (1.3.5)
addressable
addressable
daemons (1.1.9)
daemons (1.1.9)
database_rewinder (0.
1
.0)
database_rewinder (0.
2
.0)
debug_inspector (0.0.2)
debug_inspector (0.0.2)
devise (3.2.4)
devise (3.2.4)
bcrypt (~> 3.0)
bcrypt (~> 3.0)
...
@@ -118,17 +116,17 @@ GEM
...
@@ -118,17 +116,17 @@ GEM
devise (>= 3.0.0.rc)
devise (>= 3.0.0.rc)
rails (>= 4.0.0.rc1)
rails (>= 4.0.0.rc1)
diff-lcs (1.2.5)
diff-lcs (1.2.5)
docile (1.1.
3
)
docile (1.1.
5
)
domain_name (0.5.1
8
)
domain_name (0.5.1
9
)
unf (>= 0.0.5, < 1.0.0)
unf (>= 0.0.5, < 1.0.0)
draper (1.3.
0
)
draper (1.3.
1
)
actionpack (>= 3.0)
actionpack (>= 3.0)
activemodel (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
activesupport (>= 3.0)
request_store (~> 1.0.3)
request_store (~> 1.0.3)
erubis (2.7.0)
erubis (2.7.0)
eventmachine (1.0.3)
eventmachine (1.0.3)
execjs (2.
0.2
)
execjs (2.
2.1
)
factory_girl (4.4.0)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
factory_girl_rails (4.4.1)
...
@@ -137,7 +135,7 @@ GEM
...
@@ -137,7 +135,7 @@ GEM
faraday (0.9.0)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
multipart-post (>= 1.2, < 3)
ffi (1.9.3)
ffi (1.9.3)
formatador (0.2.
4
)
formatador (0.2.
5
)
gherkin (2.12.2)
gherkin (2.12.2)
multi_json (~> 1.3)
multi_json (~> 1.3)
github-markdown (0.6.5)
github-markdown (0.6.5)
...
@@ -149,7 +147,7 @@ GEM
...
@@ -149,7 +147,7 @@ GEM
lumberjack (~> 1.0)
lumberjack (~> 1.0)
pry (>= 0.9.12)
pry (>= 0.9.12)
thor (>= 0.18.1)
thor (>= 0.18.1)
guard-rspec (4.2.
8
)
guard-rspec (4.2.
10
)
guard (~> 2.1)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
rspec (>= 2.14, < 4.0)
guard-rubocop (1.1.0)
guard-rubocop (1.1.0)
...
@@ -158,19 +156,19 @@ GEM
...
@@ -158,19 +156,19 @@ GEM
guard-teaspoon (0.0.4)
guard-teaspoon (0.0.4)
guard (>= 1.6.1)
guard (>= 1.6.1)
teaspoon (>= 0.5.3)
teaspoon (>= 0.5.3)
hashie (
2.1.1
)
hashie (
3.1.0
)
hike (1.2.3)
hike (1.2.3)
htmlentities (4.3.
1
)
htmlentities (4.3.
2
)
http-cookie (1.0.2)
http-cookie (1.0.2)
domain_name (~> 0.5)
domain_name (~> 0.5)
i18n (0.6.
9
)
i18n (0.6.
11
)
i18n_generators (1.2.1)
i18n_generators (1.2.1)
mechanize
mechanize
rails (>= 3.0.0)
rails (>= 3.0.0)
jbuilder (2.
0.7
)
jbuilder (2.
1.2
)
activesupport (>= 3.0.0, < 5)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
multi_json (~> 1.2)
jquery-rails (3.1.
0
)
jquery-rails (3.1.
1
)
railties (>= 3.0, < 5.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
json (1.8.1)
...
@@ -179,12 +177,11 @@ GEM
...
@@ -179,12 +177,11 @@ GEM
launchy (2.4.2)
launchy (2.4.2)
addressable (~> 2.3)
addressable (~> 2.3)
libv8 (3.16.14.3)
libv8 (3.16.14.3)
listen (2.7.
4
)
listen (2.7.
9
)
celluloid (>= 0.15.2)
celluloid (>= 0.15.2)
celluloid-io (>= 0.15.0)
rb-fsevent (>= 0.9.3)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-inotify (>= 0.9)
lumberjack (1.0.
5
)
lumberjack (1.0.
9
)
mail (2.5.4)
mail (2.5.4)
mime-types (~> 1.16)
mime-types (~> 1.16)
treetop (~> 1.4.8)
treetop (~> 1.4.8)
...
@@ -199,21 +196,21 @@ GEM
...
@@ -199,21 +196,21 @@ GEM
webrobots (>= 0.0.9, < 0.2)
webrobots (>= 0.0.9, < 0.2)
method_source (0.8.2)
method_source (0.8.2)
mime-types (1.25.1)
mime-types (1.25.1)
mini_portile (0.
5.3
)
mini_portile (0.
6.0
)
minitest (5.
3.3
)
minitest (5.
4.0
)
multi_json (1.10.
0
)
multi_json (1.10.
1
)
multi_xml (0.5.5)
multi_xml (0.5.5)
multipart-post (2.0.0)
multipart-post (2.0.0)
mysql2 (0.3.1
5
)
mysql2 (0.3.1
6
)
net-http-digest_auth (1.4)
net-http-digest_auth (1.4)
net-http-persistent (2.9.4)
net-http-persistent (2.9.4)
net-scp (1.2.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (>= 2.6.5)
net-ssh (2.9.
0
)
net-ssh (2.9.
1
)
ne
wrelic_rpm (3.8.0.218
)
ne
trc (0.7.7
)
n
io4r (1.0.0
)
n
ewrelic_rpm (3.9.0.229
)
nokogiri (1.6.1)
nokogiri (1.6.
2.
1)
mini_portile (
~> 0.5
.0)
mini_portile (
= 0.6
.0)
ntlm-http (0.1.1)
ntlm-http (0.1.1)
oauth (0.4.7)
oauth (0.4.7)
oauth2 (0.9.3)
oauth2 (0.9.3)
...
@@ -222,11 +219,11 @@ GEM
...
@@ -222,11 +219,11 @@ GEM
multi_json (~> 1.3)
multi_json (~> 1.3)
multi_xml (~> 0.5)
multi_xml (~> 0.5)
rack (~> 1.2)
rack (~> 1.2)
omniauth (1.2.
1
)
omniauth (1.2.
2
)
hashie (>= 1.2, <
3
)
hashie (>= 1.2, <
4
)
rack (~> 1.0)
rack (~> 1.0)
omniauth-google-oauth2 (0.2.
4
)
omniauth-google-oauth2 (0.2.
5
)
omniauth (
~
> 1.0)
omniauth (> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.1.2)
omniauth-oauth2 (1.1.2)
faraday (>= 0.8, < 0.10)
faraday (>= 0.8, < 0.10)
...
@@ -234,30 +231,30 @@ GEM
...
@@ -234,30 +231,30 @@ GEM
oauth2 (~> 0.9.3)
oauth2 (~> 0.9.3)
omniauth (~> 1.2)
omniauth (~> 1.2)
orm_adapter (0.5.0)
orm_adapter (0.5.0)
paper_trail (3.0.
1
)
paper_trail (3.0.
3
)
activerecord (>= 3.0, < 5.0)
activerecord (>= 3.0, < 5.0)
activesupport (>= 3.0, < 5.0)
activesupport (>= 3.0, < 5.0)
parser (2.
1.9
)
parser (2.
2.0.pre.3
)
ast (>= 1.1, < 3.0)
ast (>= 1.1, < 3.0)
slop (~> 3.4, >= 3.4.5)
slop (~> 3.4, >= 3.4.5)
poltergeist (1.5.
0
)
poltergeist (1.5.
1
)
capybara (~> 2.1)
capybara (~> 2.1)
cliver (~> 0.3.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
websocket-driver (>= 0.2.0)
polyglot (0.3.
4
)
polyglot (0.3.
5
)
powerpack (0.0.9)
powerpack (0.0.9)
premailer (1.8.2)
premailer (1.8.2)
css_parser (>= 1.3.5)
css_parser (>= 1.3.5)
htmlentities (>= 4.0.0)
htmlentities (>= 4.0.0)
pry (0.
9.12.6
)
pry (0.
10.0
)
coderay (~> 1.0)
coderay (~> 1.
1.
0)
method_source (~> 0.8)
method_source (~> 0.8
.1
)
slop (~> 3.4)
slop (~> 3.4)
pry-rails (0.3.2)
pry-rails (0.3.2)
pry (>= 0.9.10)
pry (>= 0.9.10)
rack (1.5.2)
rack (1.5.2)
rack-mini-profiler (0.9.
1
)
rack-mini-profiler (0.9.
2
)
rack (>= 1.1.3)
rack (>= 1.1.3)
rack-test (0.6.2)
rack-test (0.6.2)
rack (>= 1.0)
rack (>= 1.0)
...
@@ -277,40 +274,45 @@ GEM
...
@@ -277,40 +274,45 @@ GEM
rake (>= 0.8.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rainbow (2.0.0)
rake (10.3.
1
)
rake (10.3.
2
)
rb-fsevent (0.9.4)
rb-fsevent (0.9.4)
rb-inotify (0.9.
4
)
rb-inotify (0.9.
5
)
ffi (>= 0.5.0)
ffi (>= 0.5.0)
rdoc (4.1.1)
rdoc (4.1.1)
json (~> 1.4)
json (~> 1.4)
ref (1.0.5)
ref (1.0.5)
request_store (1.0.5)
request_store (1.0.6)
rest-client (1.6.7)
rest-client (1.7.1)
mime-types (>= 1.16)
mime-types (>= 1.16, < 3.0)
rspec (2.14.1)
netrc (~> 0.7)
rspec-core (~> 2.14.0)
rspec (3.0.0)
rspec-expectations (~> 2.14.0)
rspec-core (~> 3.0.0)
rspec-mocks (~> 2.14.0)
rspec-expectations (~> 3.0.0)
rspec-core (2.14.8)
rspec-mocks (~> 3.0.0)
rspec-expectations (2.14.5)
rspec-core (3.0.2)
diff-lcs (>= 1.1.3, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (2.14.6)
rspec-expectations (3.0.2)
rspec-rails (2.14.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)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.14.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 2.14.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 2.14.0)
rspec-mocks (~> 3.0.0)
rubocop (0.21.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.2)
rubocop (0.24.1)
json (>= 1.7.7, < 2)
json (>= 1.7.7, < 2)
parser (
~> 2.1.9
)
parser (
>= 2.2.0.pre.3, < 3.0
)
powerpack (~> 0.0.6)
powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-progressbar (~> 1.4)
ruby-progressbar (1.
4.2
)
ruby-progressbar (1.
5.1
)
sass (3.3.
7
)
sass (3.3.
9
)
sass-rails (4.0.1)
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sass (>= 3.1.10)
...
@@ -324,7 +326,7 @@ GEM
...
@@ -324,7 +326,7 @@ GEM
multi_json
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
simplecov-html (0.8.0)
slim (2.0.
2
)
slim (2.0.
3
)
temple (~> 0.6.6)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
tilt (>= 1.3.3, < 2.1)
slop (3.5.0)
slop (3.5.0)
...
@@ -337,13 +339,13 @@ GEM
...
@@ -337,13 +339,13 @@ GEM
actionpack (>= 3.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sprockets (~> 2.8)
sshkit (1.4.0)
sshkit (1.5.1)
colorize
net-scp (>= 1.1.2)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
net-ssh (>= 2.8.0)
term-ansicolor
teaspoon (0.8.0)
teaspoon (0.8.0)
railties (>= 3.2.5, < 5)
railties (>= 3.2.5, < 5)
temple (0.6.
7
)
temple (0.6.
8
)
term-ansicolor (1.3.0)
term-ansicolor (1.3.0)
tins (~> 1.0)
tins (~> 1.0)
therubyracer (0.12.1)
therubyracer (0.12.1)
...
@@ -354,19 +356,19 @@ GEM
...
@@ -354,19 +356,19 @@ GEM
eventmachine (>= 1.0.0)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
rack (>= 1.0.0)
thor (0.19.1)
thor (0.19.1)
thread_safe (0.3.
3
)
thread_safe (0.3.
4
)
tilt (1.4.1)
tilt (1.4.1)
timers (1.1.0)
timers (1.1.0)
tins (1.
1
.0)
tins (1.
3
.0)
treetop (1.4.15)
treetop (1.4.15)
polyglot
polyglot
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
turnip (1.2.1)
turnip (1.2.1)
gherkin (>= 2.5)
gherkin (>= 2.5)
rspec (>= 2.0, < 4.0)
rspec (>= 2.0, < 4.0)
tzinfo (1.
1.0
)
tzinfo (1.
2.1
)
thread_safe (~> 0.1)
thread_safe (~> 0.1)
uglifier (2.5.
0
)
uglifier (2.5.
1
)
execjs (>= 0.3.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
json (>= 1.8.0)
unf (0.1.4)
unf (0.1.4)
...
@@ -376,7 +378,7 @@ GEM
...
@@ -376,7 +378,7 @@ GEM
warden (1.2.3)
warden (1.2.3)
rack (>= 1.0)
rack (>= 1.0)
webrobots (0.1.1)
webrobots (0.1.1)
websocket-driver (0.3.
3
)
websocket-driver (0.3.
4
)
xpath (2.0.0)
xpath (2.0.0)
nokogiri (~> 1.3)
nokogiri (~> 1.3)
...
...
app/views/partials/_app_header.html.slim
View file @
b9b0b497
...
@@ -23,7 +23,7 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation"
...
@@ -23,7 +23,7 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation"
li
li
form
form
a
.btn.btn-primary.navbar-btn
href
=
new_post_path
a
.btn.btn-primary.navbar-btn
href
=
new_post_path
|
Post
|
New
Post
span
.glyphicon.glyphicon-pencil
span
.glyphicon.glyphicon-pencil
li
.dropdown
li
.dropdown
a
.dropdown-toggle
data-toggle
=
"dropdown"
a
.dropdown-toggle
data-toggle
=
"dropdown"
...
...
app/views/posts/_form.html.slim
View file @
b9b0b497
...
@@ -67,7 +67,7 @@ input#fileupload data-url="/apis/file_receiver" multiple="" name="files[]" style
...
@@ -67,7 +67,7 @@ input#fileupload data-url="/apis/file_receiver" multiple="" name="files[]" style
-
content_for
:footer_js
do
-
content_for
:footer_js
do
javascript:
javascript:
//
$.setConfirmUnload();
$
.
setConfirmUnload
();
$
(
'#post-form'
).
mod_mdEditor
({
end_point
:
'/apis/markdown_preview'
});
$
(
'#post-form'
).
mod_mdEditor
({
end_point
:
'/apis/markdown_preview'
});
...
...
app/views/posts/_large_item.html.slim
View file @
b9b0b497
...
@@ -8,8 +8,7 @@ a.list-group-item.post-list.mod-hover-hidden data-post-id=post.id href=post_path
...
@@ -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
}
h4
.text-link
#{
post
.
title
}
.col-xs-3
.col-xs-3
span
.label.label-danger
=
post
.
display_specified_date
if
post
.
specified_date
span
.label.label-danger
=
post
.
display_specified_date
if
post
.
specified_date
small
.pull-right
small
.pull-right
"#
#{
post
.
id
}
"
##{
post
.id
}
.row
.row
.col-xs-8
.col-xs-8
small
.text-success
small
.text-success
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment