diff options
author | Logan Fick <logaldeveloper@protonmail.com> | 2018-03-12 19:26:55 -0400 |
---|---|---|
committer | Logan Fick <logaldeveloper@protonmail.com> | 2018-03-12 19:26:55 -0400 |
commit | 16a2b0fa1862cfb7b087dd3d410d7366f9c4bc06 (patch) | |
tree | a71956db13f88ae539d2bdd7e1946d9c58b19713 /app | |
parent | 5eadded99cb15e8353e70859135c714280dd5df1 (diff) |
Made many buttons and titles more consistent.
Diffstat (limited to 'app')
22 files changed, 57 insertions, 57 deletions
diff --git a/app/views/blogposts/edit.html.erb b/app/views/blogposts/edit.html.erb index 25da324..1289847 100644 --- a/app/views/blogposts/edit.html.erb +++ b/app/views/blogposts/edit.html.erb @@ -1,10 +1,10 @@ -<% title "Edit News: #{@post.title}" %> +<% title "Edit Post: #{@post.title}" %> -<h1>Edit post</h1> +<h1>Edit Post: #{@post.title}</h1> <%= form_for @post do |f|%> <%= f.text_field :title %> <%= render partial: "md_editor", locals: {name: "blogpost[content]", content: @post.content} %> <p><%= f.submit "Update Post", class: "btn blue left" %></p> <% end %> -<p><%= button_to "Delete post", @post, method: "delete", data: {confirm: "Delete post & comments forever?"}, class: "btn red right" %></p> -<div class="clear"></div>
\ No newline at end of file +<p><%= button_to "Delete Post", @post, method: "delete", data: {confirm: "Delete post & comments forever?"}, class: "btn red right" %></p> +<div class="clear"></div> diff --git a/app/views/blogposts/index.html.erb b/app/views/blogposts/index.html.erb index 9dadf42..a300fc2 100644 --- a/app/views/blogposts/index.html.erb +++ b/app/views/blogposts/index.html.erb @@ -1,7 +1,7 @@ <% title "News" %> <h1>News</h1> -<%= link_to 'Make new Post', new_blogpost_path, class: "btn blue" if mod? %> +<%= link_to 'New Post', new_blogpost_path, class: "btn blue" if mod? %> <div id="posts"> <% @posts.each do |p| %> <div class="item-group with-avatar" id="post-<%= p.id %>"> diff --git a/app/views/comments/_new.html.erb b/app/views/comments/_new.html.erb index f4b2785..aeeb89c 100644 --- a/app/views/comments/_new.html.erb +++ b/app/views/comments/_new.html.erb @@ -1,5 +1,5 @@ -<h3>New comment</h3> +<h3>New Comment</h3> <%= form_for [@post, @comment] do |f| %> <%= render partial: "md_editor", locals: {name: "comment[content]", content: @comment.content} %> <p><%= f.submit class: "btn blue" %></p> -<% end %>
\ No newline at end of file +<% end %> diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb index 5416ab6..a0ea880 100644 --- a/app/views/comments/edit.html.erb +++ b/app/views/comments/edit.html.erb @@ -1,10 +1,10 @@ <% title "Edit Comment: #{@comment.blogpost.title}" %> -<h1>Edit comment</h1> +<h1>Edit Comment</h1> <%= form_for [@comment.blogpost, @comment] do |f| %> <%= render partial: "md_editor", locals: {name: "comment[content]", content: @comment.content} %> <p><%= f.submit "Update Comment", class: "btn blue left" %></p> <% end %> -<p><%= button_to "Delete comment", [@comment.blogpost, @comment] , method: "delete", data: {confirm: "Delete comment forever?"}, class: "btn red right" %></p> -<div class="clear"></div>
\ No newline at end of file +<p><%= button_to "Delete Comment", [@comment.blogpost, @comment] , method: "delete", data: {confirm: "Delete comment forever?"}, class: "btn red right" %></p> +<div class="clear"></div> diff --git a/app/views/forumgroups/edit.html.erb b/app/views/forumgroups/edit.html.erb index bb3bf5a..1df0939 100644 --- a/app/views/forumgroups/edit.html.erb +++ b/app/views/forumgroups/edit.html.erb @@ -34,7 +34,7 @@ <td><%= f.select :role_write_id, role_selection, include_blank: false %></td> </tr> </table> - <p><%= f.submit "Update group", class: "btn blue left" %></p> + <p><%= f.submit "Update Group", class: "btn blue left" %></p> <% end %> -<p><%= button_to "Delete group", @group, :method => "delete", data: {confirm: "Delete group?\nForums + Threads will not be accessible!"}, class: "btn red right" %></p> -<div class="clear"></div>
\ No newline at end of file +<p><%= button_to "Delete Group", @group, :method => "delete", data: {confirm: "Delete group?\nForums + Threads will not be accessible!"}, class: "btn red right" %></p> +<div class="clear"></div> diff --git a/app/views/forumgroups/new.html.erb b/app/views/forumgroups/new.html.erb index 9802260..cd36247 100644 --- a/app/views/forumgroups/new.html.erb +++ b/app/views/forumgroups/new.html.erb @@ -1,6 +1,6 @@ <% title "New Forum: #{@group.name}" %> -<h1>New forum group</h1> +<h1>New Forum Group</h1> <% role_selection = Role.all_from_to(:normal, :admin).collect{|p|[p.name, p.id]} %> <%= form_for @group do |f|%> <table> @@ -21,6 +21,6 @@ <td><%= f.select :role_write_id, role_selection, include_blank: false %></td> </tr> </table> - <p><%= f.submit "Create group", class: "btn blue left" %></p> + <p><%= f.submit "Create Group", class: "btn blue left" %></p> <div class="clear"></div> -<% end %>
\ No newline at end of file +<% end %> diff --git a/app/views/forums/edit.html.erb b/app/views/forums/edit.html.erb index 571b3b7..b1a5a2e 100644 --- a/app/views/forums/edit.html.erb +++ b/app/views/forums/edit.html.erb @@ -26,7 +26,7 @@ <td><%= f.number_field :necro_length, placeholder: "Warning Delay (leave blank for no warning)" %></td> </tr> </table> - <p><%= f.submit "Update forum", class: "btn blue left" %></p> + <p><%= f.submit "Update Forum", class: "btn blue left" %></p> <% end %> -<p><%= button_to "Delete forum", @forum, method: "delete", data: {confirm: "Delete forum forever?\nThreads won't be accessible!"}, class: "btn red right" %></p> +<p><%= button_to "Delete Forum", @forum, method: "delete", data: {confirm: "Delete forum forever?\nThreads won't be accessible!"}, class: "btn red right" %></p> <div class="clear"></div> diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index a30730a..ba90117 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -1,6 +1,6 @@ <% title "Forums" %> -<%= link_to "All threads", forumthreads_path, class: "btn blue right" %> +<%= link_to "All Threads", forumthreads_path, class: "btn blue right" %> <br> <div id="forum_groups"> <% @groups.each do |group| %> diff --git a/app/views/forums/new.html.erb b/app/views/forums/new.html.erb index 836a9b2..3640fd7 100644 --- a/app/views/forums/new.html.erb +++ b/app/views/forums/new.html.erb @@ -27,6 +27,6 @@ </tr> </table> <%= f.hidden_field :forumgroup_id %> - <p><%= f.submit "Create forum", class: "btn blue left" %></p> + <p><%= f.submit "Create Forum", class: "btn blue left" %></p> <div class="clear"></div> <% end %> diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index cfe3918..5c7b843 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -6,7 +6,7 @@ </h1> <% if @forum.can_write?(current_user) %> <p> - <%= link_to "New thread", new_forumthread_path(forum: @forum), class: "btn blue" %> + <%= link_to "New Thread", new_forumthread_path(forum: @forum), class: "btn blue" %> </p> <% end %> diff --git a/app/views/forumthreads/edit.html.erb b/app/views/forumthreads/edit.html.erb index 5297249..5667cf2 100644 --- a/app/views/forumthreads/edit.html.erb +++ b/app/views/forumthreads/edit.html.erb @@ -11,7 +11,7 @@ end %> -<h1>Edit thread</h1> +<h1>Edit Thread</h1> <%= link_to @thread.forum.group, forumgroup_path(@thread.forum.group) %> → <%= link_to @thread.forum, @thread.forum %> → <%= link_to @thread, @thread %> → Edit thread <%= form_for @thread do |f|%> <table> @@ -35,7 +35,7 @@ <%= f.text_field :title, placeholder: "Title" %> </div> <%= render partial: "md_editor", locals: {name: "forumthread[content]", content: @thread.content} %> - <p><%= f.submit "Update thread", class: "btn blue left" %></p> + <p><%= f.submit "Update Thread", class: "btn blue left" %></p> <% end %> -<%= button_to "Delete thread", @thread, :method => "delete", data: {confirm: "Delete thread & comments forever?"}, class: "btn red right" %> -<div class="clear"></div>
\ No newline at end of file +<%= button_to "Delete Thread", @thread, :method => "delete", data: {confirm: "Delete thread & comments forever?"}, class: "btn red right" %> +<div class="clear"></div> diff --git a/app/views/forumthreads/index.html.erb b/app/views/forumthreads/index.html.erb index 5c3f97d..98b2b52 100644 --- a/app/views/forumthreads/index.html.erb +++ b/app/views/forumthreads/index.html.erb @@ -10,14 +10,14 @@ if params[:forum] text = "forum '#{Forum.find(params[:forum]).name}'" if params_list.except(:forum).any? - text = "Search results in #{text} (#{@threads.total_count})" + text = "Search Results in #{text} (#{@threads.total_count})" else text = text.capitalize end elsif params_list.any? - text = "Search results (#{@threads.total_count})" + text = "Search Results (#{@threads.total_count})" else - text = "All threads" + text = "All Threads" end %> <%= title text %> diff --git a/app/views/forumthreads/new.html.erb b/app/views/forumthreads/new.html.erb index 2e1d7e0..d370423 100644 --- a/app/views/forumthreads/new.html.erb +++ b/app/views/forumthreads/new.html.erb @@ -8,7 +8,7 @@ %> <%= link_to @thread.forum.group, forumgroup_path(@thread.forum.group) %> → <%= link_to @thread.forum, @thread.forum %> → New thread -<h1>New thread</h1> +<h1>New Thread</h1> <%= form_for @thread do |f|%> <table> <% if mod? %> @@ -30,6 +30,6 @@ </div> <%= render partial: "md_editor", locals: {name: "forumthread[content]", content: @thread.content} %> <%= f.hidden_field :forum_id %> - <p><%= f.submit "Create thread", class: "btn blue left" %></p> + <p><%= f.submit "Create Thread", class: "btn blue left" %></p> <div class="clear"></div> -<% end %>
\ No newline at end of file +<% end %> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 5cc921f..0158f59 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,6 +1,6 @@ -<% title "Log in" %> +<% title "Log In" %> -<h1>Log in</h1> +<h1>Log In</h1> <p>Not a member? <%= link_to "Join us", signup_path %>!</p> <%= form_tag login_path do |f| %> <table> @@ -18,4 +18,4 @@ </tr> </table> <p><%= submit_tag "Log in", class: "btn blue" %></p> -<% end %>
\ No newline at end of file +<% end %> diff --git a/app/views/threadreplies/edit.html.erb b/app/views/threadreplies/edit.html.erb index 8296d9c..a66ac90 100644 --- a/app/views/threadreplies/edit.html.erb +++ b/app/views/threadreplies/edit.html.erb @@ -1,4 +1,4 @@ -<% title "Edit Thread Reply: #{@reply.thread.title}" %> +<% title "Edit Reply: #{@reply.thread.title}" %> <% position = @reply.thread.replies.order(:id).index(@reply) @@ -6,10 +6,10 @@ %> <%= link_to @reply.thread.forum.group, forumgroup_path(@reply.thread.forum.group) %> → <%= link_to @reply.thread.forum, @reply.thread.forum %> → <%= link_to @reply.thread, forumthread_path(@reply.thread, page: page) + "#reply-#{@reply.id}" %> → Edit reply -<h1>Edit reply</h1> +<h1>Edit Reply</h1> <%= form_for [@reply.thread, @reply] do |f| %> <%= render partial: "md_editor", locals: {name: "threadreply[content]", content: @reply.content} %> <p><%= f.submit "Reply", class: "btn blue left" %></p> <% end %> -<p><%= button_to "Delete reply", [@reply.thread, @reply], method: "delete", data: {confirm: "Delete reply forever?"}, class: "btn red right" %></p> -<div class="clear"></div>
\ No newline at end of file +<p><%= button_to "Delete Reply", [@reply.thread, @reply], method: "delete", data: {confirm: "Delete reply forever?"}, class: "btn red right" %></p> +<div class="clear"></div> diff --git a/app/views/users/change_password.html.erb b/app/views/users/change_password.html.erb index 54a935c..03ce6a8 100644 --- a/app/views/users/change_password.html.erb +++ b/app/views/users/change_password.html.erb @@ -1,10 +1,10 @@ <% title "Change Password" %> -<h1>Change password</h1> +<h1>Change Password</h1> <%= form_for @user do |f| %> <%= f.text_field :current_password %> <%= f.text_field :email %> <%= f.text_field :password %> <%= f.text_field :password_confirmation %> -<% end %>
\ No newline at end of file +<% end %> diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index abd1fa4..2408c3b 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -7,7 +7,7 @@ %> <%= link_to @user.name, @user %> → Edit -<h1>Edit profile</h1> +<h1>Edit Profile</h1> <%= form_for @user do |f| %> <table> @@ -69,11 +69,11 @@ </tbody> </table> -<p><%= f.submit "Save profile", class: "btn variable-size left", disabled: (!@user.confirmed? && @user.is?(current_user)) %></p> +<p><%= f.submit "Save Profile", class: "btn variable-size left", disabled: (!@user.confirmed? && @user.is?(current_user)) %></p> <p> - <%= link_to "Edit login details", edit_login_user_path(@user), class: "btn variable-size right" %> - <%= link_to "Notification settings", edit_notifications_user_path(@user), class: "btn variable-size right" %> - <%= link_to "Website settings", edit_website_settings_user_path(@user), class: "btn variable-size right" %> + <%= link_to "Edit Login Details", edit_login_user_path(@user), class: "btn variable-size right" %> + <%= link_to "Notification Settings", edit_notifications_user_path(@user), class: "btn variable-size right" %> + <%= link_to "Website Settings", edit_website_settings_user_path(@user), class: "btn variable-size right" %> </p> <div class="clear"></div> diff --git a/app/views/users/edit_login.html.erb b/app/views/users/edit_login.html.erb index 6fef6d3..2fb9903 100644 --- a/app/views/users/edit_login.html.erb +++ b/app/views/users/edit_login.html.erb @@ -1,7 +1,7 @@ <% title "Edit Login Credentials: #{@user.name}" %> <%= link_to @user.name, @user %> → Edit Login credentials -<h1>Edit Login credentials</h1> +<h1>Edit Login Credentials</h1> <%= form_for @user, url: update_login_user_path(@user), method: :put do |f| %> @@ -33,6 +33,6 @@ </tr> </tbody> </table> - <p><%= f.submit "Save changes", class: "btn blue left" %></p> + <p><%= f.submit "Save Changes", class: "btn blue left" %></p> <div class="clear"></div> -<% end %>
\ No newline at end of file +<% end %> diff --git a/app/views/users/edit_notifications.html.erb b/app/views/users/edit_notifications.html.erb index 9c45445..5da23ae 100644 --- a/app/views/users/edit_notifications.html.erb +++ b/app/views/users/edit_notifications.html.erb @@ -48,6 +48,6 @@ <h3>Public Key</h1> <p>All notification emails will be encrypted with this key if you supply it.</p> <%= f.text_area :public_key, placeholder: "-----BEGIN PGP PUBLIC KEY BLOCK-----" %> - <p><%= f.submit "Save changes", class: "btn blue left" %></p> + <p><%= f.submit "Save Changes", class: "btn blue left" %></p> <div class="clear"></div> <% end %> diff --git a/app/views/users/edit_website_settings.html.erb b/app/views/users/edit_website_settings.html.erb index 2fdeffb..00c75aa 100644 --- a/app/views/users/edit_website_settings.html.erb +++ b/app/views/users/edit_website_settings.html.erb @@ -27,7 +27,7 @@ </tr> </tbody> </table> - <p><%= f.submit "Save changes", class: "btn blue left" %></p> + <p><%= f.submit "Save Changes", class: "btn blue left" %></p> <div class="clear"></div> <% end %> <br><br><br> diff --git a/app/views/users/lost_password.html.erb b/app/views/users/lost_password.html.erb index 85d4140..5a4fb63 100644 --- a/app/views/users/lost_password.html.erb +++ b/app/views/users/lost_password.html.erb @@ -1,6 +1,6 @@ -<% title "Reset password" %> +<% title "Reset Password" %> -<h1>Reset password</h1> +<h1>Reset Password</h1> <p>You lost your password? Don't do that!</p> <p>Luckily for you, you can reset your password. Please use the command <code>/gettoken <your email address></code>, then fill in the form below:</p> <%= form_tag reset_password_users_path do |f| %> @@ -22,5 +22,5 @@ <td><%= password_field_tag :new_password, nil, placeholder: "secret", required: true, pattern: ".{8,}", title: "minimum 8 characters", "x-moz-errormessage" => "minimum 8 characters" %></td> </tr> </table> - <p><%= submit_tag "Reset password", class: "btn blue" %></p> -<% end %>
\ No newline at end of file + <p><%= submit_tag "Reset Password", class: "btn blue" %></p> +<% end %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 1d8a8c6..cf9b78f 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,6 +1,6 @@ -<% title "Sign up" %> +<% title "Sign Up" %> -<h1>Sign up</h1> +<h1>Sign Up</h1> <%= form_for @user do |f| %> <table> @@ -38,7 +38,7 @@ You can find more details in our info page about <a href="/info/15">tokens and website registration</a>. </p> - <%= f.submit "Sign up", class: "btn blue" %> + <%= f.submit "Sign Up", class: "btn blue" %> <p>Contact us ingame if you have problems signing up!</p> <% end %> |