mirror of
https://github.com/ENSL/ensl.org.git
synced 2024-11-15 01:11:23 +00:00
Updates to gather pages: Styling & Copy
This commit is contained in:
parent
ae6d146852
commit
f438984e34
10 changed files with 46 additions and 25 deletions
|
@ -1,3 +1,5 @@
|
|||
@import "_mixins"
|
||||
|
||||
div.fieldWithErrors
|
||||
display: inline-block
|
||||
margin: 0
|
||||
|
@ -5,7 +7,8 @@ div.fieldWithErrors
|
|||
color: red
|
||||
|
||||
#errorExplanation
|
||||
width: 400px
|
||||
@include box-sizing(border-box)
|
||||
width: 100%
|
||||
margin-bottom: 20px
|
||||
padding: 7px 7px 7px 7px
|
||||
background-color: #f0f0f0
|
||||
|
@ -17,6 +20,7 @@ div.fieldWithErrors
|
|||
text-align: left
|
||||
font-weight: bold
|
||||
font-size: 12px
|
||||
width: auto
|
||||
p
|
||||
padding: 5px
|
||||
visibility: hidden
|
||||
|
|
|
@ -1,14 +1,26 @@
|
|||
@import "_mixins"
|
||||
|
||||
div
|
||||
&#gatherInfo table td
|
||||
vertical-align: top
|
||||
&#gatherInfo
|
||||
margin: 20px 0 0 0
|
||||
table td
|
||||
vertical-align: top
|
||||
&.gatherLeftBox
|
||||
width: 170px
|
||||
@include box-sizing(border-box)
|
||||
width: 230px
|
||||
height: 320px
|
||||
margin: 10px 10px 10px 0
|
||||
|
||||
&.gatherMiddleBox, &.gatherRightBox
|
||||
width: 170px
|
||||
@include box-sizing(border-box)
|
||||
width: 225px
|
||||
height: 320px
|
||||
&.gatherMiddleBox
|
||||
margin: 10px 10px 10px 0
|
||||
&.gatherRightBox
|
||||
margin: 10px 0 10px 0
|
||||
&#gatherStatus
|
||||
margin: 0 0 5px 0
|
||||
|
||||
table
|
||||
&#gatherVotes
|
||||
|
|
|
@ -179,7 +179,8 @@ input
|
|||
width: 48%
|
||||
|
||||
.wide
|
||||
width: 95%
|
||||
@include box-sizing(border-box)
|
||||
width: 100%
|
||||
|
||||
.wide2
|
||||
width: 100%
|
||||
|
|
|
@ -15,7 +15,8 @@ input
|
|||
|
||||
div
|
||||
&.shoutmsgBox
|
||||
height: 100px
|
||||
margin: 5px 0
|
||||
height: 150px
|
||||
overflow-y: scroll
|
||||
&.shoutmsg
|
||||
display: block
|
||||
|
|
|
@ -9,7 +9,10 @@
|
|||
<%= f.hidden_field :user_id %>
|
||||
<p>
|
||||
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§ion=items&appid=4920&browsesort=trend&requiredtags%5B%5D=level" %>.
|
||||
</p>
|
||||
<p>
|
||||
<% if cuser.gatherers.count < 5 %>
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
</div>
|
||||
</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">
|
||||
<h3 class="center">
|
||||
|
||||
|
|
|
@ -1,19 +1,18 @@
|
|||
<script type="text/javascript">
|
||||
$(document).ready(function(){
|
||||
// Shoutbox
|
||||
$.PeriodicalUpdater("/shoutmsgs/<%= object.class.to_s %>.js?id2=<%= object.id %>", {
|
||||
method: "GET",
|
||||
type: "script",
|
||||
minTimeout: 10000,
|
||||
multiplier: 2
|
||||
});
|
||||
});
|
||||
</script>
|
||||
$.PeriodicalUpdater("/shoutmsgs/<%= object.class.to_s %>.js?id2=<%= object.id %>", {
|
||||
method: "GET",
|
||||
type: "script",
|
||||
minTimeout: 10000,
|
||||
multiplier: 2
|
||||
});
|
||||
});
|
||||
</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 %>">
|
||||
<%= render :partial => "shoutmsgs/shoutmsg", :collection => object.shoutmsgs.recent.reverse, :locals => {:popup => "this"} %>
|
||||
</div>
|
||||
<div class="wide box shoutmsgBox" id="<%= shoutmsg_new.domain %>">
|
||||
<%= render :partial => "shoutmsgs/shoutmsg", :collection => object.shoutmsgs.recent.reverse, :locals => {:popup => "this"} %>
|
||||
</div>
|
||||
|
||||
<%= render :partial => "shoutmsgs/new", :locals => {:shoutmsg => shoutmsg_new, :popup => "this"} %>
|
||||
<%= render :partial => "shoutmsgs/new", :locals => {:shoutmsg => shoutmsg_new, :popup => "this"} %>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
<%= f.hidden_field :shoutable_id %>
|
||||
<% end %>
|
||||
<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!" %>
|
||||
</p>
|
||||
<% end %>
|
||||
|
|
|
@ -27,4 +27,4 @@ Ensl::Application.configure do
|
|||
|
||||
# Expands the lines which load the assets
|
||||
config.assets.debug = true
|
||||
end
|
||||
end
|
||||
|
|
|
@ -18,6 +18,7 @@ en:
|
|||
contests_update: "Contest was successfully updated."
|
||||
contests_join: "Team successfully joined contest."
|
||||
contests_contester_update: "Contester was successfully updated."
|
||||
gathers_join: "You have joined the Gather."
|
||||
files_create: "File was successfully created."
|
||||
files_update: "File was successfully updated."
|
||||
directories_create: "Directory was successfully created."
|
||||
|
|
Loading…
Reference in a new issue