localhots/oldhaven
1
0
Fork 0
Code Releases Activity

Moving css, starting applying new design

Browse Source
This commit is contained in:
magnolia-fan
2011-09-08 04:36:04 +04:00
parent e59f959bac
commit 6694af18c2
30 changed files with 429 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/layouts/application.html.erb
-93
View File
@@ -1,93 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>BeatHaven</title>
<meta charset="utf-8"/>
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/beathaven.css" />
<%= javascript_include_tag "http://code.jquery.com/jquery.min.js", :type => "text/javascript", :charset => "utf-8" %>
<%= javascript_include_tag "http://code.jquery.com/ui/1.8.14/jquery-ui.min.js", :type => "text/javascript", :charset => "utf-8" %>
<%= javascript_include_tag "application", :type => "text/javascript", :charset => "utf-8" %>
</head>
<body>
<div class="player-container">
<div class="player">
<div id="jplayer"></div>
<div class="now-playing" data-ls="ADD_SOME_MUSIC"></div>
<div class="progress">
<div class="loaded">
<div class="played"></div>
</div>
</div>
<div class="controls">
<div class="prev"></div>
<div class="play"></div>
<div class="pause"></div>
<div class="next"></div>
</div>
</div>
<div class="playlist" class="css-scrollbar">
<ul class="playlist-tracks"></ul>
</div>
<div class="additional-controls">
<div class="item active" id="repeat">
<img src="/images/icns/repeat.png" alt=""/><div class="annotation" data-ls="REPEAT"></div>
</div>
<div class="item" id="shuffle">
<img src="/images/icns/shuffle.png" alt=""/><div class="annotation" data-ls="SHUFFLE"></div>
</div>
<div class="item" id="empty-playlist">
<img src="/images/icns/empty.png" alt=""/><div class="annotation" data-ls="EMPTY_PLAYLIST"></div>
</div>
</div>
</div>
<div class="header-container">
<div class="hello">
<span class="greating"></span>
<div class="settings settings-button"></div>
</div>
<ul class="navigation">
<li class="logo search">BeatHaven<div class="version">0.5b</div></li>
<li class="search"><a class="a" data-ls="SEARCH"></a></li>
<li><a href="http://blog.beathaven.org/" target="_blank" data-ls="NEWS"></a></li>
<li class="about"><a class="a" data-ls="ABOUT"></a></li>
<li class="vk_auth" id="vk_login"><a class="a" data-ls="LOGIN"></a></li>
</ul>
</div>
<div class="pulldown"></div>
<div class="data-container" class="css-scrollbar">
<div class="inner"></div>
</div>
<div id="vk_api_transport"></div>
<div class="auth-notice">
<div class="arrow">&uarr;</div>
<span data-ls="LOGIN_PLEASE"></span>
</div>
<div class="fullscreen">
<div class="inner">
<img src="/images/loader.gif" alt=""/>
</div>
</div>
<div class="subpages">
<div class="search-container">
<form action="" method="post" class="search_form">
<input type="text" class="search_field"/>
<input type="submit" value="" class="search_button button gray big" data-ls="SEARCH"/>
</form>
<img class="spinner" src="/images/loader.gif" alt=""/>
<div class="artist_loading failed" data-ls="ARTIST_LOADING_FAILED"></div>
<div class="artist_loading ok" data-ls="ARTIST_LOADING_IN_PROCESS"></div>
<div class="artist_pics"></div>
<div class="suggestions">
<div data-ls="MISSPELLED"></div>
<ul></ul>
</div>
</div>
</div>
<!-- Yandex.Metrika counter -->
<script type="text/javascript">var yaParams = {};</script><div style="display:none;"><script type="text/javascript">(function(w, c) { (w[c] = w[c] || []).push(function() { try { w.yaCounter7596904 = new Ya.Metrika({id:7596904, enableAll: true,params:window.yaParams||{ }}); } catch(e) { } }); })(window, "yandex_metrika_callbacks");</script></div><script src="//mc.yandex.ru/metrika/watch.js" type="text/javascript" defer="defer"></script><noscript><div><img src="//mc.yandex.ru/watch/7596904" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
<!-- /Yandex.Metrika counter -->
</body>
</html>
app/views/layouts/application.html.haml
+51
View File
@@ -0,0 +1,51 @@
!!!5
%html
%head
%title BeatHaven
%meta{ :charset => "utf-8" }
%link{ :rel => "shortcut icon", :href => "/favicon.ico" }
= stylesheet_link_tag "application"
= javascript_include_tag "http://code.jquery.com/jquery.min.js"
= javascript_include_tag "http://code.jquery.com/ui/1.8.14/jquery-ui.min.js"
= javascript_include_tag "application"
%body
.topbar-wrapper
.topbar
.topbar-inner
.container
%h3
%a{ :href => "#" } BeatHaven
%ul.nav
%li
%a{ :href => "#" } Blog
%li
%a{ :href => "#" } About
%form{ :action => "" }
%input{ :type => "text", :placeholder => "Search" }
%ul.nav.secondary-nav
%li.dropdown
%a.dropdown-toggle{ :href => "#" } chez
%ul.dropdown-menu
%li
%a{ :href => "#" } Preferences
%li.divider
%li
%a{ :href => "#" } Logout
.popover-wrapper
.popover.below
.arrow
.inner
%h3.title Foo Fighters
.content
.container#main
.row
.span11.columns
.row.artist-info
.span4.columns.pic
%img{ :src => "http://userserve-ak.last.fm/serve/_/33371/Foo+Fighters.jpg" }
.span7.columns.desc
%h2 Foo Fighters
Foo Fighters are an American rock band formed by singer/guitarist Dave Grohl in 1995 in Seattle, USA. Grohl formed the group as a one-man project after the dissolution of his previous band Nirvana in 1994. Prior to the release of Foo Fighters in 1995, Grohl drafted Nate Mendel (bass), William Goldsmith (drums) (both of Sunny Day Real Estate and The Fire Theft), and Pat Smear (guitar) to complete the group.