upgrade to different theme for main webpage

This commit is contained in:
2012-11-09 12:25:59 +01:00
parent 6e1710ee2e
commit d41994866b
45 changed files with 479 additions and 77 deletions
BIN
View File
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 KiB

@@ -5,7 +5,7 @@ root.Qsupplier=
table_container = $('#section-table-'+table_id)
section_container = $('.section-tables-active')
section_container.append(table_container)
Qsupplier.position_table_in_active_section(section_container, table_container)
Qsupplier.position_table_in_active_section(section_container, table_container, true)
# Set the section id of the table in the database
$.ajax(
@@ -165,3 +165,6 @@ root.Qsupplier=
if table.needs_help then to.addClass('needs_help') else to.removeClass('needs_help')
if table.needs_payment then to.addClass('needs_payment') else to.removeClass('needs_payment')
)
add_tables_to_active_section: ->
number_start = $('#add-tables-number-start')
number_end = $('#add-tables-number-end')
@@ -126,6 +126,7 @@ function t(path, vars){
} catch(err){
result = parts[parts.length - 1].capitalize();
}
if(!result) return parts[parts.length - 1].capitalize();
$.each(vars, function(v, value){ result = result.replace('%{'+v+'}', value)});
return result;
}
@@ -147,7 +148,9 @@ function getUrlVars() {
$(function(){
if(getUrlVars().message){
var container = $('.alert-success');
container.find('div').text($translations[$locale]['messages'][getUrlVars().message] || ('Message ' + getUrlVars().message + ' not found'));
// Prepend messages. if there is no path/period specified
var message = t((getUrlVars().message.indexOf('.') > -1 ? '' : 'messages.' ) + getUrlVars().message )
container.find('div').text(message);
container.show();
}
if(getUrlVars().list_closed){
+1
View File
@@ -10,5 +10,6 @@
*
*= require_self
*= require_directory .
*= require 'theme1/application'
* require 'bootstrap-devise-rails'
*/
@@ -1,6 +1,6 @@
/*
*= require 'bootstrap_and_overrides'
*= require 'bootstrap_overrides'
*= require 'twitter-bootstrap/bootstrap_and_overrides'
*= require 'twitter-bootstrap/bootstrap_overrides'
*= require 'jquery-ui-1.8.23.custom.css'
*= require 'general'
*= require_directory .
@@ -1,7 +1,10 @@
$table-width: 75px
.section-title
font-size: 24px
padding: 4px 0px
.section-tables-container
.section-title
font-size: 24px
.section-manage-tables
margin: -26px 6px 4px 6px
.section-table
background-color: #ccc
height: 44px
@@ -14,6 +17,7 @@ $table-width: 75px
.table-link
margin-top: -45px
.table-number
color: black
position: absolute
top: 0
line-height: 44px
@@ -44,6 +48,7 @@ $table-width: 75px
text-decoration: none
&.section-tables-inactive
.section-table
position: relative
margin-top: 10px
margin-bottom: 30px
float: left
@@ -0,0 +1,14 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
*= require_directory .
* require 'bootstrap-devise-rails'
*/
@@ -0,0 +1,214 @@
body
background-color: #333
margin: 0
padding: 0
background-image: image-url('theme1/footer-bg.jpg')
background-position: center top
.header-nav-banner
background-image: image-url('theme1/header.jpg')
background-position: center 25px
#header-wrap
#ceiling
position: relative
width: 100%
background-image: image-url('theme1/ceiling-center.jpg')
background-position: top center
background-repeat: no-repeat
.left
background-image: image-url('theme1/ceiling-left.jpg')
background-position: right top
background-repeat: repeat-x
height: 25px
position: absolute
left: 0
width: 50%
.right
background-image: image-url('theme1/ceiling-right.jpg')
background-position: left top
background-repeat: repeat-x
height: 25px
position: absolute
right: 0
width: 50%
.lights
position: absolute
height: 140px
width: 990px
left: 50%
margin-left: -495px
div
position: relative
background-repeat: no-repeat
width: 315px
height: 140px
float: left
z-index: 2
&.light1
background-image: image-url('theme1/light-1.jpg')
margin-left: 15px
margin-right: 2px
&.light2
background-image: image-url('theme1/light-2.jpg')
margin-right: 3px
&.light3
background-image: image-url('theme1/light-3.jpg')
.container
width: 960px
padding-top: 60px
position: relative
z-index: 4
margin: 0 auto
#header
margin-bottom: 20px
height: 74px
a
margin: 20px
#nav-wrap
.container
clear: both
overflow: hidden
z-index: 100
width: 900px
height: 48px
padding: 11px 25px 24px 25px
background-image: image-url('theme1/nav-bar.png')
background-repeat: no-repeat
background-position: 0 0
margin: 0 auto
ul.nav
float: left
margin: 0
padding: 0
list-style: none
li
position: relative
float: left
list-style: none
a
border: 0
color: white
display: block
float: left
font-family: 'Pacifico',serif
font-size: 18px
height: 46px
line-height: 46px
margin: 0 10px
padding: 0 20px
text-shadow: 0 2px 2px rgba(0, 0, 0, 0.5)
#banner-wrap
z-index: 2
position: relative
.left
position: absolute
bottom: 0
left: 0
background-image: image-url('theme1/floor-left.jpg')
background-position: right
height: 48px
width: 50%
.right
position: absolute
bottom: 0
right: 0
background-image: image-url('theme1/floor-right.jpg')
background-position: left
height: 48px
width: 50%
.container
background-image: image-url('theme1/floor-center.jpg')
background-position: center bottom
background-repeat: no-repeat
margin: 0 auto
width: 982px
#banner
background-image: image-url('theme1/banner-bg.png')
background-position: 2px bottom
background-repeat: no-repeat
padding-bottom: 38px
position: relative
width: 982px
.wsite-header
border: 10px solid white
margin-left: 61px
width: 840px
height: 260px
background-image: image-url('theme1/banner-tall.jpg')
#main-wrap
font-size: 14px
font-family: Georgia, serif
line-height: 1.5
color: #848585
h1
font-size: 28px
padding: 0.5em 0 0.2em 0
line-height: 1.4
font-family: 'Pacifico', serif
color: #AE571F
h2
font-size: 24px
padding: 0.5em 0 0.2em 0
line-height: 1.2
font-family: 'Pacifico', serif
color: #AE571F
background-image: image-url('theme1/wall-bg.jpg')
background-position: center
overflow: visible
z-index: 2
position: relative
.container
background-image: image-url('theme1/content-bg.png')
background-position: 2px
min-height: 400px
margin: 0 auto
width: 974px
.content-top
width: 960px
height: 30px
margin-left: 9px
background-image: image-url('theme1/content-top.jpg')
.main-inner
width: 894px
padding: 0 40px 30px 40px
#wsite-content
#footer-wrap
color: white
background-image: image-url('theme1/footer-bg.jpg')
background-position: center
text-align: right
overflow: visible
.footer-shadow
height: 72px
width: 100%
background-image: image-url('theme1/footer-top-shadow.png')
background-repeat: repeat-x
position: relative
z-index: 4
.container
background-color: #420F03
width: 838px
padding: 72px 30px 20px 30px
position: relative
top: -72px
z-index: 3
overflow: visible
margin: 0 auto
.footer-top
width: 974px
height: 4px
position: relative
top: -72px
left: -60px
overflow: visible
background-image: image-url('theme1/footer-top.png')
.bottom
background-image: image-url('theme1/footer-bottom.png')
width: 898px
height: 35px
position: relative
bottom: -35px
left: -30px
overflow: visible
@@ -0,0 +1,14 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
*= require_directory .
* require 'bootstrap-devise-rails'
*/
+2 -2
View File
@@ -8,8 +8,8 @@
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
*= require 'bootstrap_and_overrides'
*= require 'bootstrap_overrides'
*= require 'twitter-bootstrap/bootstrap_and_overrides'
*= require 'twitter-bootstrap/bootstrap_overrides'
*= require 'general'
*= require_directory .
*= require_self