diff --git a/app/assets/javascripts/script.js b/app/assets/javascripts/script.js
index e9cd2c9..c631ecb 100644
--- a/app/assets/javascripts/script.js
+++ b/app/assets/javascripts/script.js
@@ -102,8 +102,30 @@ function remove(obj) {
}
}
-function confirm_delete() {
- $("#modal").modal('show');
+function confirm_delete(modal) {
+ $(modal).modal('show');
+}
+
+function confirm_item_delete(bookid) {
+ var modal_box = document.getElementById("Delete-Modal-Box");
+ modal_box.innerHTML =
+ '
' +
+ '
' +
+ '
' +
+ ' ' +
+ '
' +
+ '
アイテムを削除しますか?
' +
+ '
' +
+ ' ' +
+ '
' +
+ '
';
+ $('#Delete-Modal').modal('show');
}
function escape_html(string) {
diff --git a/app/assets/stylesheets/_general.scss b/app/assets/stylesheets/_general.scss
index b5266a7..b4bdfdc 100644
--- a/app/assets/stylesheets/_general.scss
+++ b/app/assets/stylesheets/_general.scss
@@ -81,6 +81,9 @@ hr{
padding-top: 24px;
}
}
+.modal{
+ padding-top: 120px;
+}
.triangle-top{
position: relative;
width: 0;
diff --git a/app/assets/stylesheets/_users.scss b/app/assets/stylesheets/_users.scss
index a301444..630240d 100644
--- a/app/assets/stylesheets/_users.scss
+++ b/app/assets/stylesheets/_users.scss
@@ -167,6 +167,3 @@
#LogoutWithdrawButtons{
margin-bottom: 15px;
}
-#modal{
- padding-top: 120px;
-}
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 604e283..0dbc375 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -32,9 +32,9 @@ def store_dir
# end
# Create different versions of your uploaded files:
- # version :thumb do
- # process resize_to_fit: [50, 50]
- # end
+ version :thumb do
+ process resize_to_limit: [106.5, 150]
+ end
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
diff --git a/app/views/books/index.html.erb b/app/views/books/index.html.erb
index bf81711..cfcccb8 100644
--- a/app/views/books/index.html.erb
+++ b/app/views/books/index.html.erb
@@ -78,7 +78,6 @@ else
end
hash_for_piechart.each{|key, value|
if counter == piechart_size
- p "a"
temp_array_for_data.push(temp_sum_of_data - temp_sum_of_0to4)
temp_array_for_labels.push("その他")
break
@@ -182,7 +181,7 @@ options_for_piechart = {
-
+
@@ -209,5 +208,8 @@ options_for_piechart = {
<% end %>
<%= link_to 'もどる', user_path(@user.id) %>
+
+
+
diff --git a/app/views/users/profile_edit.html.erb b/app/views/users/profile_edit.html.erb
index 94c88d9..f0125f7 100644
--- a/app/views/users/profile_edit.html.erb
+++ b/app/views/users/profile_edit.html.erb
@@ -45,11 +45,11 @@
- <%= link_to 'ログアウト', logout_path, class: 'btn btn-default' , success: 'ばいばーい!'%>
- <%= link_to '退会', {}, onclick: "confirm_delete();return false;", class: 'btn btn-danger' , success: 'ご利用いただきありがとうございました!'%>
+ <%= link_to 'ログアウト', {}, onclick: "confirm_delete(\"#Logout-Modal\");return false;", class: 'btn btn-default' %>
+ <%= link_to '退会', {}, onclick: "confirm_delete(\"#Leave-Modal\");return false;", class: 'btn btn-danger' %>