bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Son Sep 13 00:03:01 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-09-13 00:03:01 +02:00
parent 92667b92e9
commit 97d5427f6d
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/themes/blue1/application.css.scss
View File

@@ -16,6 +16,7 @@
*= require jquery.datetimepicker *= require jquery.datetimepicker
*= require jquery.ui.dialog *= require jquery.ui.dialog
*= require jquery.ui.autocomplete *= require jquery.ui.autocomplete
*= require jquery.ui.progressbar
*= require jquery.ui.tabs *= require jquery.ui.tabs
* require 'bootstrap' * require 'bootstrap'
* require 'neuigkeiten' * require 'neuigkeiten'

34
app/views/home/infoscreen.html.erb
View File

@@ -13,7 +13,7 @@
<% i=1 %> <% i=1 %>
<% @neuigkeiten.each do |n| %> <% @neuigkeiten.each do |n| %>
<div class="step contentbox" id="step-<%=i%>" data-x="<%= i *2000 %>" data-y="<%= Random.rand(0..5)*200 %>" data-rotate="<%= Random.rand(0..18)*10 %>" style="width:1024px; height:768px; padding: 50px; display:block" data-duration="1500"><% @toolbar_elements=[];@questions=[] %> <div class="step contentbox" id="step-<%=i%>" data-x="<%= i *2000 %>" data-y="<%= Random.rand(0..5)*200 %>" data-rotate="<%= Random.rand(0..18)*10 %>" style="width:1024px; height:500px; padding: 50px; display:block" data-duration="10000"><% @toolbar_elements=[];@questions=[] %>
<div class="media"> <div class="media">
<% unless n.picture_robust.big_thumb.to_s.empty? %> <% unless n.picture_robust.big_thumb.to_s.empty? %>
<div class="pull-left" href="#"> <div class="pull-left" href="#">
@@ -27,27 +27,43 @@
</h1> </h1>
<div itemprop="articleBody" style="font-size:large"> <div itemprop="articleBody" style="font-size:large">
<%= raw(n.text) %> <%= raw(n.text) %>
</div>
</div>
</div>
<h1>
<% if n.has_calentries? %> <% if n.has_calentries? %>
<div class="pull-right" href="#"> <div href="#">
<%= fa_icon("calendar 2x") %> <%= fa_icon("calendar 2x") %>
<%= n.relevant_calentry.text %> <%= n.relevant_calentry.text %>
</div> </div>
<% elsif n.has_meeting? %>
<div href="#">
<%= fa_icon("calendar 2x") %>
<%= n.meeting.calentry.text unless n.meeting.calentry.nil? %>
</div>
<% end %> <% end %>
</div> </h1>
</div>
</div>
</div> </div>
<% i = i+1 %> <% i = i+1 %>
<% end %> <% end %>
<div class="ui-progressbar ui-widget ui-widget-content ui-corner-all">
<div id="my-progress-bar" class="ui-progressbar-value ui-widget-header ui-corner-left" style="width:0"></div>
</div>
</div> </div>
<script> <script>
$(function () { $(function () {
$('#jmpress').jmpress(); $('#jmpress').jmpress({
duration: {
barSelector: '#my-progress-bar'
}
});
}); });
</script> </script>
</body> </body>