Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 2 commits
  • 4 files changed
  • 0 comments
  • 1 contributor
16 app/assets/stylesheets/player.css.scss
@@ -74,13 +74,10 @@
74 74 }
75 75
76 76 #comment_form {
77   - position: absolute;
78   - bottom: 0;
79   - left: 0;
80   - right: 0;
81 77 background-color: #222222;
82   - padding: 0 10px;
83 78 height: 44px;
  79 + width: 584px;
  80 + float: left;
84 81 }
85 82
86 83 #members {
@@ -93,13 +90,4 @@
93 90 margin-right: 4px;
94 91 display: inline-block;
95 92 overflow: hidden;
96   -}
97   -
98   -.comment-entry {
99   - overflow: hidden;
100   -}
101   -
102   -.comment-entry .name {
103   - font-weight: bold;
104   - padding-right: 20px;
105 93 }
105 app/assets/stylesheets/screen.css.sass
@@ -42,9 +42,20 @@ body.ui
42 42 width: 1024px
43 43 min-height: 100%
44 44 position: relative
  45 + float: left
45 46 left: 50%
46 47 margin-left: -512px
47 48 z-index: 0
  49 + background: #333
  50 + @include box-shadow(rgba(0,0,0,.8) 0 0 20px)
  51 +
  52 + #background-center
  53 + background: #444
  54 + position: absolute
  55 + top: 0
  56 + bottom: 0
  57 + width: 584px
  58 + margin: 0 220px
48 59
49 60 #wrapper
50 61 width: 100%
@@ -175,49 +186,48 @@ body.ui
175 186 z-index: 5
176 187 position: relative
177 188
178   - #column_right
179   - width: 220px
180   -
181   - #footer
182   - width: 1024px
183   - height: 44px
184   - position: absolute
185   - bottom: 0
186   - z-index: 1
187   -
188   -
189   -
190   -
191   -
  189 + #comment-entries
  190 + float: left
192 191
  192 + .comment-entry
  193 + float: left
  194 + width: 564px
  195 + margin-left: 20px
  196 + margin-bottom: 10px
193 197
  198 + .image
  199 + width: 50px
  200 + height: 50px
  201 + background: #fff
  202 + float: left
  203 + @include border-radius(25px)
  204 + @include box-shadow(rgba(0,0,0,.8) 0 2px 8px)
194 205
195   -
  206 + img
  207 + width: 44px
  208 + height: 44px
  209 + float: left
  210 + margin: 3px
  211 + @include border-radius(22px)
196 212
197   - #current-video
198   - @include background-image(linear-gradient(#f6f6f6, #c8c8c8))
199   - padding-top: 20px
200   - width: 100%
201   - float: left
202   - z-index: 20
203   - position: relative
204   - overflow: hidden
  213 + .name
  214 + color: #fff
  215 + float: left
  216 + margin: 8px 0 0 12px
  217 + width: 486px
205 218
  219 + .message
  220 + color: #222
  221 + float: left
  222 + margin: 0 0 0 12px
  223 + width: 486px
206 224
207   - .button
208   - float: left
209   - color: #fff
210   - background: $orange
211   - margin: 0 16px 16px 16px
212   - padding: 6px 10px
  225 + #column_right
  226 + width: 220px
213 227
214 228 .sidebar
215   - width: 220px
216   - position: absolute
217   - top: 0
218   - height: 100%
219   - background: #333
220   - overflow: hidden
  229 + position: relative
  230 + z-index: 0
221 231
222 232 .sidebar-video
223 233 width: 180px
@@ -269,21 +279,18 @@ body.ui
269 279 h3
270 280 color: #222
271 281
272   - #prev
273   - left: 0
  282 + #footer
  283 + width: 1024px
  284 + height: 44px
  285 + position: absolute
  286 + bottom: 0
  287 + z-index: 1
274 288
275 289 #login
276   - position: absolute
277   - bottom: 0
278   - left: 0
279   - width: 220px
280 290 height: 44px
281   - background: $orange
  291 + width: 220px
282 292 line-height: 44px
283   -
284   - a
285   - color: #fff
286   - margin-left: 20px
287   -
288   - #next
289   - right: 0
  293 + text-indent: 16px
  294 + background: $orange
  295 + color: #fff
  296 + float: left
39 app/views/home/index.html.erb
... ... @@ -1,7 +1,13 @@
1 1 <div id="container">
2 2 <div id="wrapper">
3   - <div id="column_left" class="column">
4   - tst
  3 + <div id="background-center"></div>
  4 + <div id="column_left" class="column sidebar">
  5 + <a href="#" class="sidebar-video">
  6 + <div class="sidebar-title">Sendung verpasst?</div>
  7 + <% previous_image_path = (@schedule_previous["IMG"] ? @schedule_previous["IMG"]["IUR"] : "ui/default.png") %>
  8 + <div class="sidebar-image" style="background-image: url(<%= image_path(previous_image_path) %>); background-size: cover; width: 176px; height: 117px"></div>
  9 + <h3><%= @schedule_previous["TIT"] %></h3>
  10 + </a>
5 11 </div>
6 12 <div id="column_center" class="column">
7 13 <div id="video-minified">
@@ -44,18 +50,31 @@
44 50 </div>
45 51
46 52 <ul id="members"></ul>
47   -
48   - <div id="fake_form">
49   - <input type="text" name="log_body" value="" id="log_body" autocomplete="off" />
50   - <button id="send_comment">Send</button>
51   - </div>
52 53 </div>
53 54
54   - <div id="column_right" class="column">
55   - tst
  55 + <div id="column_right" class="column sidebar">
  56 + <a href="#" class="sidebar-video">
  57 + <div class="sidebar-title">Nächste Sendungen:</div>
  58 + <% next_image_path = (@schedule_next[1]["IMG"] ? @schedule_next[1]["IMG"]["IUR"] : "ui/default.png") %>
  59 + <div class="sidebar-image" style="background-image: url(<%= image_path(next_image_path) %>); background-size: cover; width: 176px; height: 117px"></div>
  60 + <%= @schedule_next[1]["BAT"] ? "#{@schedule_next[1]["BAT"]} Uhr" : "" %>
  61 + <h3><%= @schedule_next[1]["TIT"] %></h3>
  62 + </a>
  63 +
  64 + <% @schedule_next.drop(2).each do |schedule_after_next| %>
  65 + <a href="#" class="sidebar-video sidebar-video-minified">
  66 + <div class="bookmark"></div>
  67 + <%= schedule_after_next["BAT"] ? "#{schedule_after_next["BAT"]} Uhr" : "" %>
  68 + <h3><%= schedule_after_next["TIT"] %></h3>
  69 + </a>
  70 + <% end %>
56 71 </div>
57 72 </div>
58 73 <div id="footer">
59   -
  74 + <%= link_to "Login", login_path, id: "login" %>
  75 + <div id="comment_form">
  76 + <input type="text" name="log_body" value="" id="log_body" autocomplete="off" />
  77 + <button id="send_comment">Send</button>
  78 + </div>
60 79 </div>
61 80 </div>
76 app/views/home/index.html.erb 2
... ... @@ -1,76 +0,0 @@
1   -<div id="container">
2   - <div id="prev" class="sidebar">
3   - <a href="#" class="sidebar-video">
4   - <div class="sidebar-title">Sendung verpasst?</div>
5   - <% previous_image_path = (@schedule_previous["IMG"] ? @schedule_previous["IMG"]["IUR"] : "ui/default.png") %>
6   - <div style="background-image: url(<%= image_path(previous_image_path) %>); background-size: cover; width: 176px; height: 117px"></div>
7   - <h3><%= @schedule_previous["TIT"] %></h3>
8   - </a>
9   - </div>
10   -
11   - <div id="current">
12   - <div id="current-video-minified">
13   - <%= image_tag("ui/video-teaser.jpg", :size => "59x36") %>
14   - <h1>Das Coolness-Diktat</h1>
15   - <h2>
16   - <%= @schedule_now["BAT"] ? @schedule_now["BAT"] : "" %> - <%= @schedule_next[1]["BAT"] ? "#{@schedule_next[1]["BAT"]} Uhr" : "" %>
17   - </h2>
18   - <a href="#" id="info-trigger-minified-open" class="button-square"></a>
19   - <a href="#" id="video-trigger-minified-open" class="button-square"></a>
20   - </div>
21   - <div id="current-video">
22   - <div id="teaser-button">
23   - <%= image_tag("ui/video-teaser.jpg") %>
24   - </div>
25   - <div id="description">
26   - <div id="nowon">Jetzt läuft:</div>
27   - <h1>Das Coolness-Diktat</h1>
28   - <h2>
29   - <%= @schedule_now["BAT"] ? @schedule_now["BAT"] : "" %> - <%= @schedule_next[1]["BAT"] ? "#{@schedule_next[1]["BAT"]} Uhr" : "" %>
30   - </h2>
31   - <p>
32   - Die Produkte der Firma Apple, seien es Computer oder Telefone, vermitteln den Käufern beziehungsweise Nutzern eine bestimmte Lebensart und die Zugehörigkeit zu einer besonderen - oft auch als elitär bezeichneten - Gruppe der Gesellschaft, die äußerst anziehend wirkt. Durch den Kauf eines Macintoshs, eines iPhones oder iPods fühlt sich der Verbraucher automatisch auf einer Stufe mit Künstlern und anderen Antikonformisten. <a href="#">mehr...</a>
33   - <!--
34   - Wie hat es die Firma Apple, die in einer bescheidenen Garage in Kalifornien ihren Anfang nahm und zu einem weltweit agierenden Konzern aufgestiegen ist, geschafft, die Kunden selbst zu den effizientesten Missionaren der Marke zu machen? Sogar das Logo - ein angebissener Apfel - steht für Rebellion und Freiheit. Apple scheint zu einer Art neuer Religion oder Weltanschauung geworden zu sein. Und ihr Guru heißt Steve Jobs, der vor kurzem gestorbene geniale Erfinder der kalifornischen Marke.
35   - -->
36   - </p>
37   - </div>
38   - </div>
39   - <div id="video">
40   -
41   - <div id="player"></div>
42   - </div>
43   -
44   - <div id="info-bar">
45   - <div id="count">Loading members count …</div>
46   - </div>
47   -
48   - <div id="comment-entries">
49   - </div>
50   -
51   - <ul id="members"></ul>
52   -
53   - <div id="fake_form">
54   - <input type="text" name="log_body" value="" id="log_body" autocomplete="off" />
55   - <button id="send_comment">Send</button>
56   - </div>
57   -
58   - </div>
59   -
60   - <div id="next" class="sidebar">
61   - <a href="#" class="sidebar-video">
62   - <div class="sidebar-title">Nächste Sendungen:</div>
63   - <% next_image_path = (@schedule_next[1]["IMG"] ? @schedule_next[1]["IMG"]["IUR"] : "ui/default.png") %>
64   - <div style="background-image: url(<%= image_path(next_image_path) %>); background-size: cover; width: 176px; height: 117px"></div>
65   - <%= @schedule_next[1]["BAT"] ? "#{@schedule_next[1]["BAT"]} Uhr" : "" %>
66   - <h3><%= @schedule_next[1]["TIT"] %></h3>
67   - </a>
68   - <% @schedule_next.drop(2).each do |schedule_after_next| %>
69   - <a href="#" class="sidebar-video sidebar-video-minified">
70   - <div class="bookmark"></div>
71   - <%= schedule_after_next["BAT"] ? "#{schedule_after_next["BAT"]} Uhr" : "" %>
72   - <h3><%= schedule_after_next["TIT"] %></h3>
73   - </a>
74   - <% end %>
75   - </div>
76   -</div>

No commit comments for this range

Something went wrong with that request. Please try again.