|
@@ -10,7 +10,7 @@
Loss |
Draw |
<% if actions %>
- Actions |
+ |
<% end %>
@@ -35,7 +35,7 @@
<%= h contester.loss %> |
<%= h contester.draw %> |
<% if actions %>
-
+ |
<% if @friendly %>
<% challenge = Challenge.new
challenge.contester1 = @friendly
@@ -45,9 +45,9 @@
<% end %>
<% end %>
<% if cuser and cuser.admin? %>
- <%= link_to 'E', edit_contester_path(contester) %>
- <%= link_to 'D', contester, confirm: 'Are you sure?', method: :delete %>
- <%= link_to 'R', controller: "contesters", action: "recalc", id: contester %>
+ <%= link_to icon('pencil'), edit_contester_path(contester) %>
+ <%= link_to icon('times'), contester, confirm: 'Are you sure?', method: :delete %>
+ <%= link_to icon('refresh'), controller: "contesters", action: "recalc", id: contester %>
<% end %>
|
<% end %>
diff --git a/app/views/data_files/_list.html.erb b/app/views/data_files/_list.html.erb
index d4c15cd..da4e3ea 100644
--- a/app/views/data_files/_list.html.erb
+++ b/app/views/data_files/_list.html.erb
@@ -13,9 +13,9 @@
<%= file.size_s %> |
<% if file.can_update? cuser %>
- <%= link_to 'Edit', edit_data_file_path(file) %>
+ <%= link_to icon('pencil'), edit_data_file_path(file) %>
<% end; if file.can_destroy? cuser %>
- <%= link_to 'Destroy', file, :confirm => 'Are you sure?', :method => :delete %>
+ <%= link_to icon('times'), file, :confirm => 'Are you sure?', :method => :delete %>
<% end %>
|
diff --git a/app/views/gathers/_status.html.erb b/app/views/gathers/_status.html.erb
index ac38146..8288313 100644
--- a/app/views/gathers/_status.html.erb
+++ b/app/views/gathers/_status.html.erb
@@ -27,7 +27,7 @@
<% end %>
<% else %>
- Log in to join the gather.p
+ Log in to join the gather.
<% end %>
diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 6931a37..c39a114 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -1,36 +1,34 @@
-
- <%= form_for(@issue) do |f| %>
- <%= f.error_messages %>
-
- <%= f.label :title %>
- <%= f.text_field :title %>
-
- <% if cuser and cuser.admin? %>
-
- <%= f.label :status %>
- <%= f.select :status, @issue.statuses.invert %>
-
-
- <%= link_to_function 'Assigned', "findUser('assigned')" %>
- <%= f.text_field :assigned_name, {:value => User.first(:conditions => {:id => @issue.assigned})} %>
-
- <% end %>
-
- <%= f.label :category_id %>
- <%= f.select :category_id, Category.domain(Category::DOMAIN_ISSUES).ordered.collect{|c| [c, c.id]} %>
-
-
- <%= f.label :text %>
- <%= f.text_area :text %>
-
- <% if cuser and cuser.admin? %>
-
- <%= f.label :solution %>
- <%= f.text_area :solution %>
-
- <% end %>
-
- <%= f.submit 'Save' %>
-
+<%= form_for(@issue, html: { class: 'square' }) do |f| %>
+ <%= f.error_messages %>
+
+ <%= f.label :title %>
+ <%= f.text_field :title %>
+
+ <% if cuser and cuser.admin? %>
+
+ <%= f.label :status %>
+ <%= f.select :status, @issue.statuses.invert %>
+
+
+ <%= f.label :assigned %>
+ <%= f.text_field :assigned_name, {:value => User.first(:conditions => {:id => @issue.assigned})} %>
+
<% end %>
-
+ <%= f.label :category_id %>
+ <%= f.select :category_id, Category.domain(Category::DOMAIN_ISSUES).ordered.collect{|c| [c, c.id]} %>
+
+
+ <%= f.label :text %>
+ <%= f.text_area :text, rows: 7 %>
+
+ <% if cuser and cuser.admin? %>
+
+ <%= f.label :solution %>
+ <%= f.text_area :solution, rows: 7 %>
+
+ <% end %>
+
+ <%= f.submit 'Submit' %>
+
+<% end %>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 1e208ea..cd76392 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -1,9 +1,5 @@
-
- <%= cuser and cuser.admin? ? "New Issue" : "Contact Form" %>
-
+<%= cuser ? "New Issue" : "Contact" %>
-Do not forget to include contact details like a mail address or a steam account in case you do not own an ensl account.
+Please do not forget to include contact details, such as an email address or a Steam account in the case that you do not have an ENSL account.
-<%= render :partial => "form" %>
-
-<%= link_to 'Back', issues_path %>
+<%= render partial: "form" %>
diff --git a/app/views/javascripts/_mce_full.html.erb b/app/views/javascripts/_mce_full.html.erb
index b7b27b5..149ae0c 100644
--- a/app/views/javascripts/_mce_full.html.erb
+++ b/app/views/javascripts/_mce_full.html.erb
@@ -1,14 +1,14 @@
+ $('textarea').tinymce({
+ mode : "textareas",
+ theme : "advanced",
+ plugins : "inlinepopups,contextmenu,nonbreaking,template",
+ theme_advanced_buttons1 : "bold,italic,blockquote,|,bullist,numlist,|,formatselect,|,link,unlink,image,|,cleanup,code",
+ theme_advanced_buttons2 : "",
+ theme_advanced_buttons3 : "",
+ theme_advanced_buttons4 : "",
+ convert_urls : false
+ });
+ });
+
diff --git a/app/views/javascripts/_mce_lite.html.erb b/app/views/javascripts/_mce_lite.html.erb
index 991aa8f..f6fd56d 100644
--- a/app/views/javascripts/_mce_lite.html.erb
+++ b/app/views/javascripts/_mce_lite.html.erb
@@ -1,13 +1,13 @@
diff --git a/app/views/teamers/_list.html.erb b/app/views/teamers/_list.html.erb
index 8ed86c0..83ec401 100644
--- a/app/views/teamers/_list.html.erb
+++ b/app/views/teamers/_list.html.erb
@@ -1,4 +1,4 @@
-