From 4c77e08ad86970d31f7f4c6dc53b105f21ed034d Mon Sep 17 00:00:00 2001 From: anordin Date: Tue, 23 Oct 2012 13:32:32 +0200 Subject: [PATCH] --- src/main/webapp/admins/admins.xhtml | 8 +-- src/main/webapp/contact.xhtml | 50 ++++++++++----- src/main/webapp/jsf/template/sideboxTop.xhtml | 2 +- src/main/webapp/resources/css/style.css | 15 ++--- src/main/webapp/resources/js/functions.js | 64 ++----------------- src/main/webapp/users/users.xhtml | 18 ------ 6 files changed, 48 insertions(+), 109 deletions(-) diff --git a/src/main/webapp/admins/admins.xhtml b/src/main/webapp/admins/admins.xhtml index 4f9aab0..ae8a86e 100644 --- a/src/main/webapp/admins/admins.xhtml +++ b/src/main/webapp/admins/admins.xhtml @@ -3,12 +3,10 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:ace="http://www.icefaces.org/icefaces/components"> - - Inloggad som admin. - - \ No newline at end of file + diff --git a/src/main/webapp/contact.xhtml b/src/main/webapp/contact.xhtml index 2df3180..88e6c39 100644 --- a/src/main/webapp/contact.xhtml +++ b/src/main/webapp/contact.xhtml @@ -4,29 +4,45 @@ + xmlns:ace="http://www.icefaces.org/icefaces/components" + xmlns:f="http://java.sun.com/jsf/core"> -

Contact us

+

Contact us

Ask a question in this formula. We will reach back with an answer within a week. -

- - - -


-

- -


-

- -


-

- - +

+ + + +


+ + + + +

+ + +


+ + + + +

+ +


+ + + +

+ + + + + + diff --git a/src/main/webapp/jsf/template/sideboxTop.xhtml b/src/main/webapp/jsf/template/sideboxTop.xhtml index e676902..1a64bab 100644 --- a/src/main/webapp/jsf/template/sideboxTop.xhtml +++ b/src/main/webapp/jsf/template/sideboxTop.xhtml @@ -20,7 +20,7 @@ - +

User Panel

It seems that you are not logged in. You can login here.

diff --git a/src/main/webapp/resources/css/style.css b/src/main/webapp/resources/css/style.css index 818f15b..07cfe87 100644 --- a/src/main/webapp/resources/css/style.css +++ b/src/main/webapp/resources/css/style.css @@ -277,11 +277,12 @@ nav#main_menu{ text-align: center; } -.autoCompleteTextAreaForm +.inputTextArea,.autoCompleteTextAreaForm { padding: 4px 6px; font-size: 12px; - width: 100%; + width: 95%; + margin: 0 auto 0px auto; height: 250px; overflow: hidden; resize: none; @@ -334,7 +335,7 @@ label{ border: 1px solid #FFF; } -span.error{ +span.error, div.error, ul.error{ color:#000; background-color:#ffeded; padding:5px; @@ -342,14 +343,6 @@ span.error{ border:1px solid #f27c7c; } -div.error, ul.error{ - color:#000; - background-color:#ffeded; - padding:5px; - margin:0 0 0 10px; - border:1px solid #f27c7c; -} - ul.error{ margin-top: 10px; width: 94%; diff --git a/src/main/webapp/resources/js/functions.js b/src/main/webapp/resources/js/functions.js index 9dbffbd..529a5ec 100644 --- a/src/main/webapp/resources/js/functions.js +++ b/src/main/webapp/resources/js/functions.js @@ -6,8 +6,13 @@ */ // This is a bug-fix. +function greeting() +{ +alert("hej"); +} + var $ = jQuery; -$(document).ready(function() { +$(document).ready(function() { // Handles the effects of the main menu. $("#toggle_arrow").click(function () { @@ -26,59 +31,4 @@ $(document).ready(function() { $(this).addClass("arrow_right"); } }); // toggle end -}); // document ready end - - -$(document).ready(function() { - $(function() { - var availableTags = [ - "Arlanda Airport (Stockholm)", - - "Amsterdam Airport Schiphol", - - "Bangkok International Airport", - - "Beijing Capital International Airport", - - "Dubai International Airport", - - "Frankfurt Airport", - - "Haneda Airport (Tokyo)", - - "Heathrow Airport (London)", - - "Hong Kong International Airport", - - "O'Hare International Airport (Chicago)", - - "John F. Kennedy International Airport (New York City)", - - "Landvetter Airport (Gothenburg)", - - "Leonardo da Vinci-Fiumicino Airport (Rome)", - - "London Gatwick Airport", - - "Los Angeles International Airport", - - "Madrid Barajas Airport", - - "McCarran International Airport (Las Vegas)", - - "Munich Airport", - - "Newark Liberty International Airport (New Jersey)", - - "Paris-Charles de Gaulle Airport", - - "San Francisco International Airport", - - "Singapore Changi Airport", - ]; - $( ".autoCompleteInputForm" ).autocomplete({ - source: availableTags - }); - }); - -}); +}); // document ready end \ No newline at end of file diff --git a/src/main/webapp/users/users.xhtml b/src/main/webapp/users/users.xhtml index 74d9cae..ae8a86e 100644 --- a/src/main/webapp/users/users.xhtml +++ b/src/main/webapp/users/users.xhtml @@ -7,24 +7,6 @@ xmlns:ace="http://www.icefaces.org/icefaces/components"> - -
-
-

Search for a flight now!

-
- - -


-

-


-

- - -
-