From 011425d2b82c8d792db11c6de0dca658ffd177af Mon Sep 17 00:00:00 2001 From: randomdan Date: Tue, 22 Nov 2011 21:04:07 +0000 Subject: HTML5 and jQuery --- gentoobrowse/.p2config | 3 + gentoobrowse/css/screen.css | 210 +++++++++++++----- gentoobrowse/datasources/poweredBy.txt | 1 + gentoobrowse/images/simple-blue-wave.jpg | Bin 0 -> 6121 bytes gentoobrowse/js/js.js | 9 + gentoobrowse/js/tabs.js | 10 - gentoobrowse/present/search.xml | 30 +-- gentoobrowse/present/signup.xml | 2 +- gentoobrowse/xslt/atomebuilds.xslt | 2 +- gentoobrowse/xslt/base.xslt | 143 +++++++------ gentoobrowse/xslt/categories.xslt | 33 ++- gentoobrowse/xslt/category.xslt | 24 +-- gentoobrowse/xslt/error.xslt | 4 +- gentoobrowse/xslt/form.xslt | 4 +- gentoobrowse/xslt/herd.xslt | 4 +- gentoobrowse/xslt/home.xslt | 50 ++--- gentoobrowse/xslt/login.xslt | 4 +- gentoobrowse/xslt/package.xslt | 351 ++++++++++++++++--------------- gentoobrowse/xslt/popular.xslt | 22 +- gentoobrowse/xslt/search.xslt | 69 +++--- 20 files changed, 529 insertions(+), 446 deletions(-) create mode 100644 gentoobrowse/images/simple-blue-wave.jpg create mode 100644 gentoobrowse/js/js.js delete mode 100644 gentoobrowse/js/tabs.js diff --git a/gentoobrowse/.p2config b/gentoobrowse/.p2config index 9adbd90..40c426a 100644 --- a/gentoobrowse/.p2config +++ b/gentoobrowse/.p2config @@ -1,2 +1,5 @@ +sessionModule = couchsession +session.couchdb.baseurl = http://firebrand:5984/p2sessions/ +session.couchdb.baseurl = http://defiant:5984/p2sessions/ errorcontenttype=text/xml-xslt errortransformstyle=xslt/error.xslt diff --git a/gentoobrowse/css/screen.css b/gentoobrowse/css/screen.css index e277be9..d8470b6 100644 --- a/gentoobrowse/css/screen.css +++ b/gentoobrowse/css/screen.css @@ -1,21 +1,33 @@ html { - background: white url('/images/glogo-small.png') no-repeat 10px 5px; - font-family: cursive, sans-serif; + background: white url('/images/simple-blue-wave.jpg') no-repeat left top; + font-family: 'Open Sans', sans-serif; + padding: 0; + margin: 0; } body { + background: transparent url('/images/glogo-small.png') no-repeat 0 0; font-size: 11px; + margin: 10px 40px 10px 10px; + padding: 0; } -h1 { +header h1 { + font-family: 'Salsa', cursive, sans-serif; font-style: italic; font-weight: bold; font-size: 45px; - margin: 20px 160px 5px; + margin: 0px 160px 10px; + padding-top: 10px; border-bottom: 1px solid black; height: 66px; } -.tabs { +nav ul { font-size: 15px; text-align: center; + margin: 10px; +} +nav li { + padding: 0px 7px; + display: inline; } h2 { padding: 0; @@ -28,26 +40,101 @@ p.summary { p.error { color: red; } - -.colLeft { - vertical-align: top; +a, a:visited { + color: blue; +} +nav { + clear: both; +} +#news { width: 130px; padding: 5px; + float: left; +} +#news ul { + padding-left: 15px; } -.content { - vertical-align: top; - border-left: 3px dotted black; +#content { padding: 5px; } +footer { + clear: both; + padding: 20px; +} +article#content { + margin-left: 150px; +} -.newebuilds th { - margin: 0; +/* New ebuilds */ +article#content section.newebuilds { + float: left; +} +section.newebuilds { width: 33%; } +.newebuilds h3 { + display: block; + text-align: center; + margin: 2px; +} .newebuilds ul { - margin: 0; + margin: 0px; + padding: 0 0 0 15px; +} +.newebuilds p { + margin: 0 0 2px 0; +} +.synctime { + font-size: 9px; + padding-left: 6px; +} + +/* Popup forms */ +form#login { + width: 200px; + margin-left: -100px; + display: none; +} +form#search { + width: 300px; + margin-left: -150px; + display: none; +} +form.popup { + position: fixed; + background-color: #ededff; + border: 1px solid #a0a0ff; + padding: 20px; + left: 50%; + top: 25%; + box-shadow: 8px 8px 8px #bbb; + border-radius: 10px; +} +form.popup h1 { + font-size: 14px; + margin: 0px; + padding-bottom: 3px; +} +form.popup input.submit { + width: 80px; + border: 1px solid #a0a0ff; + color: #3030aa; + background-color: #ddddff; + margin-bottom: 0px; + float: right; + border-radius: 3px; + margin-left: 10px; +} +form.popup input { + display: block; + border: 1px solid #aaaaff; + border-radius: 3px; + width: 100%; + margin-bottom: 4px; + padding: 2px; } +/* Package details */ .ver { font-size: large; padding: 5px 20px; @@ -57,84 +144,91 @@ p.error { color: red; font-weight: bold; } -.urls { +#urls { float: right; margin: 8px 30px; } -.urls a { +#urls a { display: block; } -div.trademark, div.poweredby { +p.disclaimer, ul.poweredby { text-align: center; color: gray; font-size: 9px; margin: 10px; + display: block; +} +ul.poweredby li { + display: inline; + padding: 0px 3px; } .warning { color: red; font-weight: bold; } -form.generalForm table { - width: 500px; - background-color: #ddddff; - border: 1px solid #aaaaff; -} - -form.generalForm td input { - border: 1px solid #aaaaff; - width: 98%; -} .tracked { font-weight: bold; } -.syncdate { - font-size: larger; -} -.synctime { - font-size: smaller; -} #dotrack, #dountrack { font-size: 8px; margin: 0 10px; } -.tabstrip { +/* Package detail tabs */ +ul.ui-tabs-nav { + padding-left: 16px; white-space: nowrap; + margin-bottom: 0; } -.tabbox { - margin: 0px; +ul.ui-tabs-nav li a { + text-decoration: none; + padding: 0 8px 0 10px; } -.tabvisible, .tabhidden { - padding: 10px 20px; - margin: 0px; +ul.ui-tabs-nav li { + font-weight: normal; + background-color: white; + display: inline; + padding: 0; + font-size: 14px; border: 1px solid grey; + margin: 0 2px; + border-top-left-radius: 10px; + border-top-right-radius: 10px; +} +ul.ui-tabs-nav li.ui-tabs-selected { + border-bottom: 1px solid #eeeeee; background: #eeeeee; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; } -.tabvisible { +section.ui-tabs-panel { display: block; + padding: 10px 20px; + border: 1px solid grey; + box-shadow: 8px 8px 8px #bbb; + margin: 0 10px; + background: #eeeeee; + border-radius: 5px; } -.tabhidden { +section.ui-tabs-hide { display: none; } -.tabhandle a { + +/* Search results accordian */ +h3.ui-accordion-header { + margin: 2px; + box-shadow: none; + outline: none; +} +h3.ui-accordion-header a { text-decoration: none; - padding: 0 8px 0 10px; + color: black; } -.tabhandle { - font-weight: normal; - display: inline; - padding: 0 0; - font-size: 14px; +.accordionpane { + padding: 10px; border: 1px solid grey; - margin: 0 2px; - -webkit-border-top-left-radius: 10px; - -webkit-border-top-right-radius: 10px; - -moz-border-radius-topleft: 10px; - -moz-border-radius-topright: 10px; - border-top-left-radius: 10px; - border-top-right-radius: 10px; + box-shadow: 8px 8px 8px #bbb; + margin-top: 10px; + margin-right: 30px; + background: #eeeeee; + border-radius: 5px; } diff --git a/gentoobrowse/datasources/poweredBy.txt b/gentoobrowse/datasources/poweredBy.txt index 0e3bead..c71422d 100644 --- a/gentoobrowse/datasources/poweredBy.txt +++ b/gentoobrowse/datasources/poweredBy.txt @@ -3,5 +3,6 @@ PostgreSQL|http://www.postgresql.org/ Apache|http://httpd.apache.org/ FastCGI|http://www.fastcgi.com/drupal/ XSLT|http://www.w3.org/TR/xslt/ +jQuery|http://jquery.com/ Boost|http://www.boost.org/ Project2|http://project2.randomdan.homeip.net/ diff --git a/gentoobrowse/images/simple-blue-wave.jpg b/gentoobrowse/images/simple-blue-wave.jpg new file mode 100644 index 0000000..8366a2e Binary files /dev/null and b/gentoobrowse/images/simple-blue-wave.jpg differ diff --git a/gentoobrowse/js/js.js b/gentoobrowse/js/js.js new file mode 100644 index 0000000..35dc3de --- /dev/null +++ b/gentoobrowse/js/js.js @@ -0,0 +1,9 @@ +function hideForm(f) { + $(f).fadeOut('slow'); + return false; +} +function toggleForm(f) { + $('form.popup').not(f).fadeOut('slow'); + $(f).fadeToggle('slow'); + return false; +} diff --git a/gentoobrowse/js/tabs.js b/gentoobrowse/js/tabs.js deleted file mode 100644 index c1cd1ae..0000000 --- a/gentoobrowse/js/tabs.js +++ /dev/null @@ -1,10 +0,0 @@ -function showTab(name) -{ - var children = document.getElementById('tabcontainer').childNodes; - for(var c = 0; c != children.length; c++) { - if (children[c].className == 'tabvisible') { - children[c].className = 'tabhidden'; - } - } - document.getElementById(name).className = 'tabvisible'; -} diff --git a/gentoobrowse/present/search.xml b/gentoobrowse/present/search.xml index 5a96f2a..9f2f0df 100644 --- a/gentoobrowse/present/search.xml +++ b/gentoobrowse/present/search.xml @@ -4,17 +4,6 @@ - - - - - -
- -
- - @@ -24,26 +13,9 @@ - - - - - - - -
- -
- - - - - - - + diff --git a/gentoobrowse/present/signup.xml b/gentoobrowse/present/signup.xml index d818016..fcf3d8c 100644 --- a/gentoobrowse/present/signup.xml +++ b/gentoobrowse/present/signup.xml @@ -5,7 +5,7 @@
- +
diff --git a/gentoobrowse/xslt/atomebuilds.xslt b/gentoobrowse/xslt/atomebuilds.xslt index bd18e12..aa7e911 100644 --- a/gentoobrowse/xslt/atomebuilds.xslt +++ b/gentoobrowse/xslt/atomebuilds.xslt @@ -1,7 +1,7 @@ - + diff --git a/gentoobrowse/xslt/base.xslt b/gentoobrowse/xslt/base.xslt index 7f02a74..34f2dad 100644 --- a/gentoobrowse/xslt/base.xslt +++ b/gentoobrowse/xslt/base.xslt @@ -1,71 +1,94 @@ - + - - - - - - - - - + - - - +

Search results for ""

 - - -

Search Results for ""

-
    - -
- - -

Nothing found

- - +
+

Packages ()

+
    + +
+
- - -

Search Results for ""

- - - -

Nothing found

- - +
+

Bugs ()

+ +
-- cgit v1.2.3