Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Cosmo/TVHackday2012
base: 0b4019adb1
...
head fork: Cosmo/TVHackday2012
compare: a50874a1ef
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Oct 21, 2012
@Cosmo ui update 8fac324
@Cosmo delete crap a50874a
View
16 app/assets/stylesheets/player.css.scss
@@ -74,13 +74,10 @@
}
#comment_form {
- position: absolute;
- bottom: 0;
- left: 0;
- right: 0;
background-color: #222222;
- padding: 0 10px;
height: 44px;
+ width: 584px;
+ float: left;
}
#members {
@@ -93,13 +90,4 @@
margin-right: 4px;
display: inline-block;
overflow: hidden;
-}
-
-.comment-entry {
- overflow: hidden;
-}
-
-.comment-entry .name {
- font-weight: bold;
- padding-right: 20px;
}
View
105 app/assets/stylesheets/screen.css.sass
@@ -42,9 +42,20 @@ body.ui
width: 1024px
min-height: 100%
position: relative
+ float: left
left: 50%
margin-left: -512px
z-index: 0
+ background: #333
+ @include box-shadow(rgba(0,0,0,.8) 0 0 20px)
+
+ #background-center
+ background: #444
+ position: absolute
+ top: 0
+ bottom: 0
+ width: 584px
+ margin: 0 220px
#wrapper
width: 100%
@@ -175,49 +186,48 @@ body.ui
z-index: 5
position: relative
- #column_right
- width: 220px
-
- #footer
- width: 1024px
- height: 44px
- position: absolute
- bottom: 0
- z-index: 1
-
-
-
-
-
+ #comment-entries
+ float: left
+ .comment-entry
+ float: left
+ width: 564px
+ margin-left: 20px
+ margin-bottom: 10px
+ .image
+ width: 50px
+ height: 50px
+ background: #fff
+ float: left
+ @include border-radius(25px)
+ @include box-shadow(rgba(0,0,0,.8) 0 2px 8px)
-
+ img
+ width: 44px
+ height: 44px
+ float: left
+ margin: 3px
+ @include border-radius(22px)
- #current-video
- @include background-image(linear-gradient(#f6f6f6, #c8c8c8))
- padding-top: 20px
- width: 100%
- float: left
- z-index: 20
- position: relative
- overflow: hidden
+ .name
+ color: #fff
+ float: left
+ margin: 8px 0 0 12px
+ width: 486px
+ .message
+ color: #222
+ float: left
+ margin: 0 0 0 12px
+ width: 486px
- .button
- float: left
- color: #fff
- background: $orange
- margin: 0 16px 16px 16px
- padding: 6px 10px
+ #column_right
+ width: 220px
.sidebar
- width: 220px
- position: absolute
- top: 0
- height: 100%
- background: #333
- overflow: hidden
+ position: relative
+ z-index: 0
.sidebar-video
width: 180px
@@ -269,21 +279,18 @@ body.ui
h3
color: #222
- #prev
- left: 0
+ #footer
+ width: 1024px
+ height: 44px
+ position: absolute
+ bottom: 0
+ z-index: 1
#login
- position: absolute
- bottom: 0
- left: 0
- width: 220px
height: 44px
- background: $orange
+ width: 220px
line-height: 44px
-
- a
- color: #fff
- margin-left: 20px
-
- #next
- right: 0
+ text-indent: 16px
+ background: $orange
+ color: #fff
+ float: left
View
39 app/views/home/index.html.erb
@@ -1,7 +1,13 @@
<div id="container">
<div id="wrapper">
- <div id="column_left" class="column">
- tst
+ <div id="background-center"></div>
+ <div id="column_left" class="column sidebar">
+ <a href="#" class="sidebar-video">
+ <div class="sidebar-title">Sendung verpasst?</div>
+ <% previous_image_path = (@schedule_previous["IMG"] ? @schedule_previous["IMG"]["IUR"] : "ui/default.png") %>
+ <div class="sidebar-image" style="background-image: url(<%= image_path(previous_image_path) %>); background-size: cover; width: 176px; height: 117px"></div>
+ <h3><%= @schedule_previous["TIT"] %></h3>
+ </a>
</div>
<div id="column_center" class="column">
<div id="video-minified">
@@ -44,18 +50,31 @@
</div>
<ul id="members"></ul>
-
- <div id="fake_form">
- <input type="text" name="log_body" value="" id="log_body" autocomplete="off" />
- <button id="send_comment">Send</button>
- </div>
</div>
- <div id="column_right" class="column">
- tst
+ <div id="column_right" class="column sidebar">
+ <a href="#" class="sidebar-video">
+ <div class="sidebar-title">Nächste Sendungen:</div>
+ <% next_image_path = (@schedule_next[1]["IMG"] ? @schedule_next[1]["IMG"]["IUR"] : "ui/default.png") %>
+ <div class="sidebar-image" style="background-image: url(<%= image_path(next_image_path) %>); background-size: cover; width: 176px; height: 117px"></div>
+ <%= @schedule_next[1]["BAT"] ? "#{@schedule_next[1]["BAT"]} Uhr" : "" %>
+ <h3><%= @schedule_next[1]["TIT"] %></h3>
+ </a>
+
+ <% @schedule_next.drop(2).each do |schedule_after_next| %>
+ <a href="#" class="sidebar-video sidebar-video-minified">
+ <div class="bookmark"></div>
+ <%= schedule_after_next["BAT"] ? "#{schedule_after_next["BAT"]} Uhr" : "" %>
+ <h3><%= schedule_after_next["TIT"] %></h3>
+ </a>
+ <% end %>
</div>
</div>
<div id="footer">
-
+ <%= link_to "Login", login_path, id: "login" %>
+ <div id="comment_form">
+ <input type="text" name="log_body" value="" id="log_body" autocomplete="off" />
+ <button id="send_comment">Send</button>
+ </div>
</div>
</div>
View
76 app/views/home/index.html.erb 2
@@ -1,76 +0,0 @@
-<div id="container">
- <div id="prev" class="sidebar">
- <a href="#" class="sidebar-video">
- <div class="sidebar-title">Sendung verpasst?</div>
- <% previous_image_path = (@schedule_previous["IMG"] ? @schedule_previous["IMG"]["IUR"] : "ui/default.png") %>
- <div style="background-image: url(<%= image_path(previous_image_path) %>); background-size: cover; width: 176px; height: 117px"></div>
- <h3><%= @schedule_previous["TIT"] %></h3>
- </a>
- </div>
-
- <div id="current">
- <div id="current-video-minified">
- <%= image_tag("ui/video-teaser.jpg", :size => "59x36") %>
- <h1>Das Coolness-Diktat</h1>
- <h2>
- <%= @schedule_now["BAT"] ? @schedule_now["BAT"] : "" %> - <%= @schedule_next[1]["BAT"] ? "#{@schedule_next[1]["BAT"]} Uhr" : "" %>
- </h2>
- <a href="#" id="info-trigger-minified-open" class="button-square"></a>
- <a href="#" id="video-trigger-minified-open" class="button-square"></a>
- </div>
- <div id="current-video">
- <div id="teaser-button">
- <%= image_tag("ui/video-teaser.jpg") %>
- </div>
- <div id="description">
- <div id="nowon">Jetzt läuft:</div>
- <h1>Das Coolness-Diktat</h1>
- <h2>
- <%= @schedule_now["BAT"] ? @schedule_now["BAT"] : "" %> - <%= @schedule_next[1]["BAT"] ? "#{@schedule_next[1]["BAT"]} Uhr" : "" %>
- </h2>
- <p>
- 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>
- <!--
- 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.
- -->
- </p>
- </div>
- </div>
- <div id="video">
-
- <div id="player"></div>
- </div>
-
- <div id="info-bar">
- <div id="count">Loading members count …</div>
- </div>
-
- <div id="comment-entries">
- </div>
-
- <ul id="members"></ul>
-
- <div id="fake_form">
- <input type="text" name="log_body" value="" id="log_body" autocomplete="off" />
- <button id="send_comment">Send</button>
- </div>
-
- </div>
-
- <div id="next" class="sidebar">
- <a href="#" class="sidebar-video">
- <div class="sidebar-title">Nächste Sendungen:</div>
- <% next_image_path = (@schedule_next[1]["IMG"] ? @schedule_next[1]["IMG"]["IUR"] : "ui/default.png") %>
- <div style="background-image: url(<%= image_path(next_image_path) %>); background-size: cover; width: 176px; height: 117px"></div>
- <%= @schedule_next[1]["BAT"] ? "#{@schedule_next[1]["BAT"]} Uhr" : "" %>
- <h3><%= @schedule_next[1]["TIT"] %></h3>
- </a>
- <% @schedule_next.drop(2).each do |schedule_after_next| %>
- <a href="#" class="sidebar-video sidebar-video-minified">
- <div class="bookmark"></div>
- <%= schedule_after_next["BAT"] ? "#{schedule_after_next["BAT"]} Uhr" : "" %>
- <h3><%= schedule_after_next["TIT"] %></h3>
- </a>
- <% end %>
- </div>
-</div>

No commit comments for this range

Something went wrong with that request. Please try again.