---
src/app/stylesheets/_base.scss | 4 ++++
src/app/stylesheets/aggregator.scss | 25 ++++++++++++++++++++++++-
src/app/views/layouts/aggregator.haml | 3 ++-
src/public/images/footer-shade.png | Bin 0 -> 220 bytes
src/public/javascripts/aggregator.js | 17 +++++++++++++++++
5 files changed, 47 insertions(+), 2 deletions(-)
create mode 100644 src/public/images/footer-shade.png
create mode 100644 src/public/javascripts/aggregator.js
diff --git a/src/app/stylesheets/_base.scss b/src/app/stylesheets/_base.scss
index 697fab2..3708195 100644
--- a/src/app/stylesheets/_base.scss
+++ b/src/app/stylesheets/_base.scss
@@ -10,6 +10,10 @@ $headerbg: #0B3559;
$formheadbg: #eee;
$formheadfg: #333;
+$footerbg: #f3f3f3;
+
+
+
@import "text";
@mixin border-radius($radius) {
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
index 27c4fd4..a1603be 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -54,7 +54,8 @@ input[type='submit'],button {
background-color: $headerbg;
border-bottom: 2px solid desaturate(lighten($headerbg,30%),50%);
overflow: hidden;
- #header {
+ header {
+ display: block;
h1 {
text-transform: uppercase;
font-size: 110%;
@@ -144,3 +145,25 @@ input[type="text"],input[type="password"],textarea {
padding-left: 150px;
}
}
+
+footer {
+ font-size: 90%;
+ margin: 10px 0 0;
+ padding: 10px;
+ display: block;
+ background: $footerbg url(/images/footer-shade.png) repeat-x 0 0;
+ ul {
+ display: block;
+ padding: 10px 10px 0 0;
+ min-height: 50px;
+ li {
+ display: block;
+ float: right;
+ }
+ }
+
+ &.fixed {
+ position: absolute;
+ bottom: 0; left: 0; right: 0;
+ }
+}
diff --git a/src/app/views/layouts/aggregator.haml
b/src/app/views/layouts/aggregator.haml
index b998804..2e7ca91 100644
--- a/src/app/views/layouts/aggregator.haml
+++ b/src/app/views/layouts/aggregator.haml
@@ -18,6 +18,7 @@
= javascript_include_tag "facebox.js"
= javascript_include_tag "jquery.ui-1.8.1/jquery-ui-1.8.1.custom.min.js"
= javascript_include_tag "jquery.loadmask.min"
+ = javascript_include_tag "aggregator"
= yield :scripts
- if controller.respond_to?(:section_id)
@@ -26,7 +27,7 @@
- section_id = ""
%body{:id => section_id}
%div#head
- %div#header.container_16
+ %header.container_16
= render :partial => '/layouts/header'
- if current_user.nil?
#formwindow
diff --git a/src/public/images/footer-shade.png
b/src/public/images/footer-shade.png
new file mode 100644
index
0000000000000000000000000000000000000000..134023511c76c8add4ddb9c7dbf5efe9f93ca93a
GIT binary patch
literal 220
zcm...@n?(olHy`uVBq!ia0vp^B0wz8!3HF`W%CyUDVAa<&kznEsNqQI0P;BtJR*yM
z>aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0wKo-U3d
z7QJsTZ{%%o;bmevu...@bybi+^*4qmc({ZVk5o3Oi*I8TKNL}}ZOdaZ^})g;3~jsj
z2Nj(Ax#D0nms`uW#I%3BYqT^o?&`{ZXIOH0T6})9^dF`j3}<;n&bD9m%>!D(;OXk;
j...@?2>_PjNGbpT
literal 0
HcmV?d00001
diff --git a/src/public/javascripts/aggregator.js
b/src/public/javascripts/aggregator.js
new file mode 100644
index 0000000..163254c
--- /dev/null
+++ b/src/public/javascripts/aggregator.js
@@ -0,0 +1,17 @@
+/* Aggregator JS */
+
+$(document).ready(function () {
+ $(window).scroll(positionFooter).resize(positionFooter).scroll();
+
+});
+
+
+function positionFooter() {
+ var $footer = $('footer');
+ if ($(document.body).height() < $(window).height()) {
+ $footer.addClass('fixed');
+ } else {
+ $footer.removeClass('fixed');
+ }
+}
+
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
