ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-01-27 19:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updates to gather pages: Styling & Copy

Browse source
This commit is contained in:
Luke Barratt 2014-04-05 01:03:13 +01:00
parent 6269d4a69b
commit ad907c5933
10 changed files with 46 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/sass/errors.sass
View file

@ -1,3 +1,5 @@
@import "_mixins"
div.fieldWithErrors div.fieldWithErrors
display: inline-block display: inline-block
margin: 0 margin: 0
@ -5,7 +7,8 @@ div.fieldWithErrors
color: red color: red
#errorExplanation #errorExplanation
width: 400px @include box-sizing(border-box)
width: 100%
margin-bottom: 20px margin-bottom: 20px
padding: 7px 7px 7px 7px padding: 7px 7px 7px 7px
background-color: #f0f0f0 background-color: #f0f0f0
@ -17,6 +20,7 @@ div.fieldWithErrors
text-align: left text-align: left
font-weight: bold font-weight: bold
font-size: 12px font-size: 12px
width: auto
p p
padding: 5px padding: 5px
visibility: hidden visibility: hidden

20
app/assets/stylesheets/sass/gather.sass
View file

@ -1,14 +1,26 @@
@import "_mixins"
div div
&#gatherInfo table td &#gatherInfo
vertical-align: top margin: 20px 0 0 0
table td
vertical-align: top
&.gatherLeftBox &.gatherLeftBox
width: 170px @include box-sizing(border-box)
width: 230px
height: 320px height: 320px
margin: 10px 10px 10px 0
&.gatherMiddleBox, &.gatherRightBox &.gatherMiddleBox, &.gatherRightBox
width: 170px @include box-sizing(border-box)
width: 225px
height: 320px height: 320px
&.gatherMiddleBox
margin: 10px 10px 10px 0
&.gatherRightBox
margin: 10px 0 10px 0
&#gatherStatus &#gatherStatus
margin: 0 0 5px 0
table table
&#gatherVotes &#gatherVotes

3
app/assets/stylesheets/sass/general.sass
View file

@ -179,7 +179,8 @@ input
width: 48% width: 48%
.wide .wide
width: 95% @include box-sizing(border-box)
width: 100%
.wide2 .wide2
width: 100% width: 100%

3
app/assets/stylesheets/sass/shoutbox.sass
View file

@ -15,7 +15,8 @@ input
div div
&.shoutmsgBox &.shoutmsgBox
height: 100px margin: 5px 0
height: 150px
overflow-y: scroll overflow-y: scroll
&.shoutmsg &.shoutmsg
display: block display: block

5
app/views/gathers/_status.html.erb
View file

@ -9,7 +9,10 @@
<%= f.hidden_field :user_id %> <%= f.hidden_field :user_id %>
<p> <p>
Gather running, <%= Gather::FULL - @gather.gatherers.length %> more needed. Gather running, <%= Gather::FULL - @gather.gatherers.length %> more needed.
Download the custom maps <a href="http://www.duplexgaming.co.uk/downloads/maps/">here</a>. </p>
<p>
You can download custom maps via the
<%= link_to "Steam Workshop", "http://steamcommunity.com/workshop/browse?searchtext=&childpublishedfileid=0&section=items&appid=4920&browsesort=trend&requiredtags%5B%5D=level" %>.
</p> </p>
<p> <p>
<% if cuser.gatherers.count < 5 %> <% if cuser.gatherers.count < 5 %>

2
app/views/gathers/show.html.erb
View file

@ -62,7 +62,7 @@
</div> </div>
</h2> </h2>
<% if @gather and @gather.created_at > 24.hours.ago and @gather.status != Gather::STATE_FINISHED %> <% if @gather and @gather.status != Gather::STATE_FINISHED %>
<div class="box wide" id="gatherInfo"> <div class="box wide" id="gatherInfo">
<h3 class="center"> <h3 class="center">

27
app/views/shoutmsgs/_index.html.erb
View file

@ -1,19 +1,18 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
// Shoutbox $.PeriodicalUpdater("/shoutmsgs/<%= object.class.to_s %>.js?id2=<%= object.id %>", {
$.PeriodicalUpdater("/shoutmsgs/<%= object.class.to_s %>.js?id2=<%= object.id %>", { method: "GET",
method: "GET", type: "script",
type: "script", minTimeout: 10000,
minTimeout: 10000, multiplier: 2
multiplier: 2 });
}); });
}); </script>
</script>
<% shoutmsg_new = Shoutmsg.new(:shoutable_type => object.class.to_s, :shoutable_id => object.id) %> <% shoutmsg_new = Shoutmsg.new(:shoutable_type => object.class.to_s, :shoutable_id => object.id) %>
<div class="wide box shoutmsgBox" id="<%= shoutmsg_new.domain %>"> <div class="wide box shoutmsgBox" id="<%= shoutmsg_new.domain %>">
<%= render :partial => "shoutmsgs/shoutmsg", :collection => object.shoutmsgs.recent.reverse, :locals => {:popup => "this"} %> <%= render :partial => "shoutmsgs/shoutmsg", :collection => object.shoutmsgs.recent.reverse, :locals => {:popup => "this"} %>
</div> </div>
<%= render :partial => "shoutmsgs/new", :locals => {:shoutmsg => shoutmsg_new, :popup => "this"} %> <%= render :partial => "shoutmsgs/new", :locals => {:shoutmsg => shoutmsg_new, :popup => "this"} %>

2
app/views/shoutmsgs/_new.html.erb
View file

@ -9,7 +9,7 @@
<%= f.hidden_field :shoutable_id %> <%= f.hidden_field :shoutable_id %>
<% end %> <% end %>
<p> <p>
<%= f.text_field :text, :size => 12, :id => "#{shoutmsg.domain}_text" %> <%= f.text_field :text, size: 12, id: "#{shoutmsg.domain}_text", class: "shout_input" %>
<%= submit_tag "Shout!" %> <%= submit_tag "Shout!" %>
</p> </p>
<% end %> <% end %>

2
config/environments/development.rb
View file

@ -27,4 +27,4 @@ Ensl::Application.configure do
# Expands the lines which load the assets # Expands the lines which load the assets
config.assets.debug = true config.assets.debug = true
end end

1
config/locales/en.yml
View file

@ -18,6 +18,7 @@ en:
contests_update: "Contest was successfully updated." contests_update: "Contest was successfully updated."
contests_join: "Team successfully joined contest." contests_join: "Team successfully joined contest."
contests_contester_update: "Contester was successfully updated." contests_contester_update: "Contester was successfully updated."
gathers_join: "You have joined the Gather."
files_create: "File was successfully created." files_create: "File was successfully created."
files_update: "File was successfully updated." files_update: "File was successfully updated."
directories_create: "Directory was successfully created." directories_create: "Directory was successfully created."