diff options
Diffstat (limited to 'www/index.html')
| -rw-r--r-- | www/index.html | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/www/index.html b/www/index.html index 5343b90..b549e41 100644 --- a/www/index.html +++ b/www/index.html @@ -9,25 +9,11 @@ <link rel="shortcut icon" href="/img/favicon.ico" /> <link href="/javascript/twitter-bootstrap/css/bootstrap.css" rel="stylesheet"> + <link href="/styles/main-style.css" rel="stylesheet"> <link href="/styles/auth.css" rel="stylesheet"> <link href="/styles/shows.css" rel="stylesheet"> <link href="/styles/jingles.css" rel="stylesheet"> <link href="/styles/musicpools.css" rel="stylesheet"> - <style type="text/css"> - body { - background-color: #eee; - padding-top: 60px; - padding-bottom: 40px; - } - - .btn i[class*='icon-'] { - vertical-align: middle; - } - - .progress { - margin-bottom: 0; - } - </style> <link href="/javascript/twitter-bootstrap/css/bootstrap-responsive.css" rel="stylesheet"> <script src="/javascript/jquery/jquery.min.js"></script> <script src="/javascript/twitter-bootstrap/js/bootstrap.min.js"></script> @@ -103,13 +89,13 @@ <div class="row-fluid"> <div class="span10"> <form class="well form-inline"> - <label class="control-label" for="select-dropbox"><h3>Sendung auswählen</h3></label> - <select id="show-selector" onchange="shows_showSelected()"> + <label class="control-label" for="show-selector"><h3>Sendung auswählen</h3></label> + <select id="show-selector" class="main-selector" onchange="shows_showSelected()"> </select> </form> </div> <div class="span2"> - <div id="shows-clock"> + <div id="clock"> <span class="current-week"></span> <span class="clock-date"></span> <span class="clock-time"></span> @@ -160,11 +146,21 @@ <div id="app-jingles" class="container-fluid"> <div class="alertbox"></div> - <div class="span12"> - <h1>Jingles</h1> - <p> - coming soon! - </p> + <div class="row-fluid"> + <div class="span10"> + <form class="well form-inline"> + <label class="control-label" for="show-selector"><h3>Jingle Gruppe auswählen</h3></label> + <select id="jingle-selector" class="main-selector" onchange="jingle_groups_showSelected()"> + </select> + </form> + </div> + <div class="span2"> + <div id="clock"> + <span class="current-week"></span> + <span class="clock-date"></span> + <span class="clock-time"></span> + </div> + </div> </div> </div> |