Folowing patches implement new administer section navigation and bring some changes and polishing to layout.scss.
The administer section navigation is kind of work in progress...
--- src/app/stylesheets/layout.scss | 405 --------------------------------------- 1 files changed, 0 insertions(+), 405 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index af41d65..4ce4391 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -183,411 +183,6 @@ form{ display: inline; }
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Page Layout -- v.0.0.2 [layout] (960.css) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -/* - 960 Grid System ~ Core CSS. - Learn more ~ http://960.gs/ - - Licensed under GPL and MIT. -*/ - -/* - Forces backgrounds to span full width, - even if there is horizontal scrolling. - Increase this if your layout is wider. - - Note: IE6 works fine without this fix. -*/ - -body { - min-width: 960px; -} - -/* Containers -----------------------------------------------------------------------------------------------------*/ -.container_16 { - margin-left: auto; - margin-right: auto; - width: 960px; -} - -/* Grid >> Global -----------------------------------------------------------------------------------------------------*/ - -.grid_1, -.grid_2, -.grid_3, -.grid_4, -.grid_5, -.grid_6, -.grid_7, -.grid_8, -.grid_9, -.grid_10, -.grid_11, -.grid_12, -.grid_13, -.grid_14, -.grid_15, -.grid_16 { - display: inline; - float: left; - position: relative; - margin-left: 10px; - margin-right: 10px; -} - -.push_1, .pull_1, -.push_2, .pull_2, -.push_3, .pull_3, -.push_4, .pull_4, -.push_5, .pull_5, -.push_6, .pull_6, -.push_7, .pull_7, -.push_8, .pull_8, -.push_9, .pull_9, -.push_10, .pull_10, -.push_11, .pull_11, -.push_12, .pull_12, -.push_13, .pull_13, -.push_14, .pull_14, -.push_15, .pull_15, -.push_16, .pull_16 { - position: relative; -} - -/* Grid >> Children (Alpha ~ First, Omega ~ Last) -----------------------------------------------------------------------------------------------------*/ - -.alpha { - margin-left: 0; -} - -.omega { - margin-right: 0; -} - -/* Grid >> 16 Columns -----------------------------------------------------------------------------------------------------*/ - -.container_16 .grid_1 { - width: 40px; -} - -.container_16 .grid_2 { - width: 100px; -} - -.container_16 .grid_3 { - width: 160px; -} - -.container_16 .grid_4 { - width: 220px; -} - -.container_16 .grid_5 { - width: 280px; -} - -.container_16 .grid_6 { - width: 340px; -} - -.container_16 .grid_7 { - width: 400px; -} - -.container_16 .grid_8 { - width: 460px; -} - -.container_16 .grid_9 { - width: 520px; -} - -.container_16 .grid_10 { - width: 580px; -} - -.container_16 .grid_11 { - width: 640px; -} - -.container_16 .grid_12 { - width: 700px; -} - -.container_16 .grid_13 { - width: 760px; -} - -.container_16 .grid_14 { - width: 820px; -} - -.container_16 .grid_15 { - width: 880px; -} - -.container_16 .grid_16 { - width: 940px; -} - -/* Prefix Extra Space >> 16 Columns -----------------------------------------------------------------------------------------------------*/ - -.container_16 .prefix_1 { - padding-left: 60px; -} - -.container_16 .prefix_2 { - padding-left: 120px; -} - -.container_16 .prefix_3 { - padding-left: 180px; -} - -.container_16 .prefix_4 { - padding-left: 240px; -} - -.container_16 .prefix_5 { - padding-left: 300px; -} - -.container_16 .prefix_6 { - padding-left: 360px; -} - -.container_16 .prefix_7 { - padding-left: 420px; -} - -.container_16 .prefix_8 { - padding-left: 480px; -} - -.container_16 .prefix_9 { - padding-left: 540px; -} - -.container_16 .prefix_10 { - padding-left: 600px; -} - -.container_16 .prefix_11 { - padding-left: 660px; -} - -.container_16 .prefix_12 { - padding-left: 720px; -} - -.container_16 .prefix_13 { - padding-left: 780px; -} - -.container_16 .prefix_14 { - padding-left: 840px; -} - -.container_16 .prefix_15 { - padding-left: 900px; -} - -/* Suffix Extra Space >> 16 Columns -----------------------------------------------------------------------------------------------------*/ - -.container_16 .suffix_1 { - padding-right: 60px; -} - -.container_16 .suffix_2 { - padding-right: 120px; -} - -.container_16 .suffix_3 { - padding-right: 180px; -} - -.container_16 .suffix_4 { - padding-right: 240px; -} - -.container_16 .suffix_5 { - padding-right: 300px; -} - -.container_16 .suffix_6 { - padding-right: 360px; -} - -.container_16 .suffix_7 { - padding-right: 420px; -} - -.container_16 .suffix_8 { - padding-right: 480px; -} - -.container_16 .suffix_9 { - padding-right: 540px; -} - -.container_16 .suffix_10 { - padding-right: 600px; -} - -.container_16 .suffix_11 { - padding-right: 660px; -} - -.container_16 .suffix_12 { - padding-right: 720px; -} - -.container_16 .suffix_13 { - padding-right: 780px; -} - -.container_16 .suffix_14 { - padding-right: 840px; -} - -.container_16 .suffix_15 { - padding-right: 900px; -} - -/* Push Space >> 16 Columns -----------------------------------------------------------------------------------------------------*/ - -.container_16 .push_1 { - left: 60px; -} - -.container_16 .push_2 { - left: 120px; -} - -.container_16 .push_3 { - left: 180px; -} - -.container_16 .push_4 { - left: 240px; -} - -.container_16 .push_5 { - left: 300px; -} - -.container_16 .push_6 { - left: 360px; -} - -.container_16 .push_7 { - left: 420px; -} - -.container_16 .push_8 { - left: 480px; -} - -.container_16 .push_9 { - left: 540px; -} - -.container_16 .push_10 { - left: 600px; -} - -.container_16 .push_11 { - left: 660px; -} - -.container_16 .push_12 { - left: 720px; -} - -.container_16 .push_13 { - left: 780px; -} - -.container_16 .push_14 { - left: 840px; -} - -.container_16 .push_15 { - left: 900px; -} - -/* Pull Space >> 16 Columns -----------------------------------------------------------------------------------------------------*/ - -.container_16 .pull_1 { - left: -60px; -} - -.container_16 .pull_2 { - left: -120px; -} - -.container_16 .pull_3 { - left: -180px; -} - -.container_16 .pull_4 { - left: -240px; -} - -.container_16 .pull_5 { - left: -300px; -} - -.container_16 .pull_6 { - left: -360px; -} - -.container_16 .pull_7 { - left: -420px; -} - -.container_16 .pull_8 { - left: -480px; -} - -.container_16 .pull_9 { - left: -540px; -} - -.container_16 .pull_10 { - left: -600px; -} - -.container_16 .pull_11 { - left: -660px; -} - -.container_16 .pull_12 { - left: -720px; -} - -.container_16 .pull_13 { - left: -780px; -} - -.container_16 .pull_14 { - left: -840px; -} - -.container_16 .pull_15 { - left: -900px; -}
/* `Clear Floated Elements ----------------------------------------------------------------------------------------------------*/
--- src/app/stylesheets/layout.scss | 23 ++++++++++++++--------- src/app/views/layouts/application.haml | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index 4ce4391..0d345f3 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -183,7 +183,6 @@ form{ display: inline; }
- /* `Clear Floated Elements ----------------------------------------------------------------------------------------------------*/
@@ -253,19 +252,27 @@ strong, em, b, i{ font-family: $font-family-em; }
/* Content */
-$contentpadding: 7px; +$monitorcontentpadding: 7px; +$administercontentpadding: 0px; + +body.monitor div#content{ + width: $width - (2 * $monitorcontentpadding); + padding: $monitorcontentpadding; + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.50); + -moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50); + -webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50); +} +body.administer div#content{ + width: $width; + padding: $administercontentpadding; +}
div#content{ - width: $width - (2 * $contentpadding); margin: 0 auto; margin-bottom: 98px; min-height: 200px; -webkit-border-radius: 7px; -moz-border-radius: 7px; border-radius: 7px; background-color: #FAFAFA; - padding: $contentpadding; - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.50); - -moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50); - -webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50); border: 1px solid #999; position: relative; z-index: 100; @@ -277,8 +284,6 @@ div#content{
}
- - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Page Layout -- v.0.0.2 [layout] (layout_ie.css) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ diff --git a/src/app/views/layouts/application.haml b/src/app/views/layouts/application.haml index 87806c4..102c31a 100644 --- a/src/app/views/layouts/application.haml +++ b/src/app/views/layouts/application.haml @@ -37,7 +37,7 @@ = javascript_include_tag "rails.js" = csrf_meta_tag = yield :scripts - %body + %body{:class => "#{controller.top_section == :administer ? 'administer' : 'monitor'}" } #primary-container
%header#masthead
--- src/app/stylesheets/custom.scss | 18 +------ src/app/stylesheets/layout.scss | 59 ++++++++++++++++++++ src/app/views/layouts/_admin_header.haml | 46 ++++++---------- src/public/images/administer_nav_bg.png | Bin 0 -> 2008 bytes src/public/images/administer_nav_bg_hover.png | Bin 0 -> 496 bytes src/public/images/administer_nav_content_icon.png | Bin 0 -> 1010 bytes .../images/administer_nav_environments_icon.png | Bin 0 -> 722 bytes .../images/administer_nav_providers_icon.png | Bin 0 -> 1070 bytes src/public/images/administer_nav_users_icon.png | Bin 0 -> 552 bytes 9 files changed, 77 insertions(+), 46 deletions(-) create mode 100644 src/public/images/administer_nav_bg.png create mode 100644 src/public/images/administer_nav_bg_hover.png create mode 100644 src/public/images/administer_nav_content_icon.png create mode 100644 src/public/images/administer_nav_environments_icon.png create mode 100644 src/public/images/administer_nav_providers_icon.png create mode 100644 src/public/images/administer_nav_users_icon.png
diff --git a/src/app/stylesheets/custom.scss b/src/app/stylesheets/custom.scss index fae47c7..a81a508 100644 --- a/src/app/stylesheets/custom.scss +++ b/src/app/stylesheets/custom.scss @@ -1,19 +1,3 @@ -#admin_subsections { - height: 2em; - display: block; -} -#admin_subsections li { - list-style-type: none; - float: left; - margin-right: 1em; -} -#admin_subsections li.selected { - font-weight: bold; -} -#admin_subsections a { - color: blue; -} - #user-menu.nojs a { margin-left: 1em; } @@ -77,4 +61,4 @@ footer.standard{ height: 30px; display:block; background: url(../../images/loading.gif) no-repeat center; -} \ No newline at end of file +} diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index 0d345f3..5614305 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -999,6 +999,65 @@ nav#primary { }
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Administer section navigation-- v.0.0.2 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +nav#administer_nav { + background: transparent url(../../images/administer_nav_bg.png) left bottom repeat-x; + -webkit-border-radius: 7px 7px 0px 0px; + -moz-border-radius: 7px 7px 0px 0px; + border-radius: 7px 7px 0px 0px; + padding-top: 3px; + + ul{ + display: table; + margin: 0 auto; + } + + li { + float: left; + text-align: center; + list-style-type: none; + + a{ + text-decoration: none; + display: block; + color: black; + + div{padding: 45px 10px 12px 10px;} + div.users{background: transparent url(../../images/administer_nav_users_icon.png) center 18px no-repeat;} + div.environments{background: transparent url(../../images/administer_nav_environments_icon.png) center 16px no-repeat;} + div.content{background: transparent url(../../images/administer_nav_content_icon.png) center 15px no-repeat;} + div.providers{background: transparent url(../../images/administer_nav_providers_icon.png) center 15px no-repeat;} + } + a:hover{ + background: transparent url(../../images/administer_nav_bg_hover.png) center bottom no-repeat; + } + a.selected{ + background: transparent url(../../images/administer_nav_bg_hover.png) center bottom no-repeat; + } + } +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Admin Page Header -- v.0.0.2 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +#admin_page_header{ + background: #e7e7e7; /* Old browsers */ + background: -moz-linear-gradient(top, #e7e7e7 0%, #dadada 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e7e7e7), color-stop(100%,#dadada)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #e7e7e7 0%,#dadada 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #e7e7e7 0%,#dadada 100%); /* Opera11.10+ */ + background: -ms-linear-gradient(top, #e7e7e7 0%,#dadada 100%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e7e7e7', endColorstr='#dadada',GradientType=0 ); /* IE6-9 */ + background: linear-gradient(top, #e7e7e7 0%,#dadada 100%); /* W3C */ + border-bottom: 1px solid #C4C4C4; + margin: -7px 0px 0px 0px; + padding-top: 7px; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Breadcrumb Navigation -- v.0.0.2 [nav_hist_bar] (nav_hist_bar.scss) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/src/app/views/layouts/_admin_header.haml b/src/app/views/layouts/_admin_header.haml index fb4a8e0..262182f 100644 --- a/src/app/views/layouts/_admin_header.haml +++ b/src/app/views/layouts/_admin_header.haml @@ -1,29 +1,17 @@ --#We'll figure out a better way to deal with this later. -%noscript - %nav#admin_subsections - = render_navigation({:expand_all => true, :level => 2}) - --# TODO: Actually design nav for the Administer section. --# Ugly hack to avoid moving files around for the moment.. Abs position the nav :/ -#tab_actions{:style => "position: absolute; top: -32px; right: 0px;"} - %label.label.small{:for => 'admin-section-select'} Control Panels - %select#admin-section-select - %option{:value => users_path} Choose section... - - if check_privilege(Privilege::VIEW, User) - %option{:value => users_path} Users - %option{:value => roles_path} Roles - %option{:value => providers_path} Providers - %option{:value => provider_accounts_path} Provider Accounts - %option{:value => hardware_profiles_path} Hardware Profiles - %option{:value => realms_path} Realms - %option{:value => pool_families_path} Pool Families - %option{:value => catalogs_path} Catalogs - %option{:value => catalog_entries_path} Catalog Entries - %option{:value => settings_path} Settings - -:javascript - $(document).ready(function() { - $('select#admin-section-select').change(function() { - window.location = $(this).val(); - }); - }); +%nav#administer_nav + %ul + %li + - link_to users_path do + %div.users Users & Groups + %li + - link_to users_path do + %div.environments Environments + %li + - link_to users_path, :class => "selected" do + %div.content Content + %li + - link_to providers_path do + %div.providers Cloud Providers + .clear +#admin_page_header + this is admin_page_header diff --git a/src/public/images/administer_nav_bg.png b/src/public/images/administer_nav_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..493dd6528c138ed95872a5514a9342f096474a11 GIT binary patch literal 2008 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 WUxdJ(l=H{UZ!JG4oOgwjaO^*1FH;Wy
literal 0 HcmV?d00001
diff --git a/src/public/images/administer_nav_bg_hover.png b/src/public/images/administer_nav_bg_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..9ebd5d07e10577dce892c8b298f7afb02c6b6064 GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^IY4a7!3HEfw)D&gQY^(zo*^7SP{WbZ0pxQQctjR6 zFmMZjFyp1Wb$@_@G9|7NCBgY=CFO}lsSJ)O`AMk?Zka`?<@rU~#R|^BriEJ{n*r5{ zfYdn`r6!hS=I1GdWag$aSn3<<8yc#AoTkaZ!06@a;uumf=j|;+FXljz)`!B9+}hh8 z32hSDeS6nj&AXj<x11EZ(-?VhbAV$&;S3eyKmGrkr!b52Jui|^G55V3+hSPrkHv7y zwY=?ePM;+u&RmEpR&BarAi>;RsCo!Ye|*T3d^o|zDj`Rrr}5wpp+qqKgRgmGq5&J* z<Eb1#S)dSav!Q{+{X_#Zo?{0R_JCFKf|NK5F*5^=0_x-8IR;h?rXO2_c#pkWfJ%T` z+73!c^!%UIgk)w}H2;Px7JdAlag*-o|M;_Wm7KoS1+NW_s@=|q+or0RNAnl-t+G<N zscw1p&yyKXUS=_`Ww^UR-*|SJ&!+XOwuiRunxx0%{f~ET_l8M*KnBm-Dg7JxX7iLL x#<EWP!?AYt2B9ApKhDl?Kap+4t?hY_v7l*NTWxWr2{6<dJYD@<);T3K0RRKty($0z
literal 0 HcmV?d00001
diff --git a/src/public/images/administer_nav_content_icon.png b/src/public/images/administer_nav_content_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..78df8abd0e6022e1e7a14fbef0d8105eea593976 GIT binary patch literal 1010 zcmV<O0}cF%P)<h;3K|Lk000e1NJLTq001Qb000^Y1^@s6FtU|<00004b3#c}2nYxW zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs6m&&cbVG7wVRUJ4ZXi@?ZDjyCFEKAMF(>hsDF6TiOi4sR zR7i=vm(Ob(M-<0DyN)F#R-Is+P{)v81R6+8bFxpR@u8Q-w8!QUU2@ewV1fiC_#pBR z6ne`cketkbeCj#^9}-N8d=d&sNP*gzxM=a(VpYl6P7nK*sIFvbS56-c%P#Z2^Vv6V zX5JW_jv2rhV9L{w?|)14<f#V<X+5yZP%vkJbG2ISq2o9&kB*MEwOG5|F4?yIYq?xr z0?tZb<0QdRp-dpYxw-j`>$-3B0CQdUO)i(a0>s4k)S*luQ79Ddd7gJL2q-Ym^A0vP zHogVo{lJESGVwzm6QP*ACoIca3<J~+w!FN2L$v-gl_x<3xiYc0xA(Z!YQ1i?TCWce z4`0Zie(AdIyRblk?eFjZ2As!V6hlLu0Vdn+cBz+Wy<UGF6(}&J)OSGQc(nRKnZQK7 zUjKR2flspS?d@m1qNTO&nQSHypPHJw-#3n@V98|iHhmKQ_y+?&0VfQ@xbQilOw&A% zKYinzuy>h2+_J32QIa@}xvu-pvaChABBr}?D$>4l8s>T4L7`B%Cs8xIp<<a#=KB8) z)D4!&WUd3T0LlcC)oS(0D8iLW<@ZtitJUfgAQ?>KI56!v&fBPhrBdk?@I$Ru+l;E= zIL=#OT6jnRvr)xt+paAvEPM~l&(F`_Z#J7BqG|!N!oxY>Y7~)9r_;=4vyXtUfGfbQ zY&QF71gNXR<3l-)Qwb}glzIx>1};iITmtT_udn|SR?BgmN&sadmErF0?pBDs58Jli z@9gaSv9`AMHP8k=uB@z_RZ870m&;|_w%>=*lktNJl^Ad-olY->{ky<`DImGEwe@3E zjdVJ_B$1ARe;`f*H}m;?E+W({Fl|}ZPf`5y`FswzDI8<qpF44(oKs3YjR186xV*Z$ znhNVHc{wNJ$LTr;P5gwP0p?Pv)PrKNs2Yt%eMqQlz>HGr;V}IhjYhp#EUHv0^+14T zWPDR={jbw`Oh}Uw#!37eNKokaI?4Y69N<r&Bf=MfFM`}SW?B-t1GInxX-)ja;vI(y zA~r5?2|m^2Mjxn;0_NhcoN)n*)1%ZCC@p>+@ofV~0!uF_WboipY0^JR!62SA&8OOa gkWb%Bs@9r+0LulbP0&3zeE<Le07*qoM6N<$f-Y9n8UO$Q
literal 0 HcmV?d00001
diff --git a/src/public/images/administer_nav_environments_icon.png b/src/public/images/administer_nav_environments_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..16c23e1fc3c07f046ff85beb666218a27e3eab87 GIT binary patch literal 722 zcmV;@0xkWCP)<h;3K|Lk000e1NJLTq000yK000{Z1^@s6eBZCw00004b3#c}2nYxW zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs6m&&cbVG7wVRUJ4ZXi@?ZDjyCFEKAMF(>hsDF6ThEJ;K` zR7i>KmcNeLKoG{i{c8gX2w`#sx(cLJ$pa*9Djt9$W!@y!JwaX}k3fIuPEjOM9ZiIV zkV3G?K>>Ft@!qaC1vav510qtoj5N*c%+E9Xt#(ZS(3D#MQS27Sjil;Gst(R(v$+bx z@Kz~x1E2(eoq!?EDJi9H!Z5sDuh&-q91cKiHXEnaYQ2sVYXBYqgz2vy09J$$Zvf!_ z{{9O9L1Ms#we}kTOeT|$)oS%uxm;G2O63CpeE?bl(6H8i2LM9I3jhm_%wBD`TS+N3 zaa_h>Qvl=uoJ`E}>{x@rVAN<d9-GbPb~qfqt=H>HN}20$u~@j%>9m##MF66t!+k-o z*LyF7(5uzzvy@VE&LcudPVr{5$z9hiWq_7v6Rowx7(<m(+!#X{V}+t<t(j6PSDy=v z$K#Rfx=KpP68IsY);f2*a=>=G{faSWD5cSSJ|9v_3lF%pmRM^^HeUGkbkVW(BFlB? z`~IB}LJJ`@=egzcft^n0C1cFYX0xwF>YlRP$O+`o-ksgycsw3Cj-#ZMMfv9glaUjZ z&jtQh`5&n4`~IDj^68YyhxRuC?z{0k?}9OAIOitaan_<JqM6HKpH~8K83e(#{Ywji z;2OXsfD*y(ny&$P-tYI{d7jrgI%~$3%jJ)5xBCgePXKFz-RtE7cow^Z6X!EMId-q( zL+rl^c8@dzAYvFl6R2b869AJ|D)|#2DL-a5<@-O4KlK+V#sK;b-2eap07*qoM6N<$ Eg4$a-y8r+H
literal 0 HcmV?d00001
diff --git a/src/public/images/administer_nav_providers_icon.png b/src/public/images/administer_nav_providers_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..20dd41f9a12512c2c68c0e4f1bccdf7e5184546b GIT binary patch literal 1070 zcmV+}1kwA6P)<h;3K|Lk000e1NJLTq001KZ000{Z1^@s6_V6~D00004b3#c}2nYxW zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs6m&&cbVG7wVRUJ4ZXi@?ZDjyCFEKAMF(>hsDF6Tih)G02 zR7i=nmtANaRTRg6v$J3MurB!3mLMgPHM%JxYTA9#M2plU77=}r79li^wS|J92z`i9 zu*A>@MOuk(MPCF#EDh;GAi)wQA}(PGfyE|Kx+$(Cn~d2k)18m&!`vlnyPIa)**~1O z;m+^=@44rkt5CZXzz3)@6d3>luw^(h?kOR}ePFmh508zF?bmhv2h%h&;tu8W`D@F| z%cp@RAW#OnEle#yid?ukm&<*7CqN|`hA}@qJ^eBe!gbOU7zGFn4-Y?S7{>fgKuWT0 z``?L)iEbdg9Z)SWeqh(?>gtcRfRqDGPEK}7hbkV~PGNjNV=|dMem@{3<@5Ppfr#8# z%`ggXvNi%w7>04{L12UsVrpvYUAf*}?%WGT1sW~Ox~c2>Zx0G0gb>+m_9y9%S}RNl zc+3lkk_^MR1?&cb)nKY+xDWRRc&1P&v<J65RJ~O`8Nq?u7r&PPeq@!kENjzCAPG}i zzaoquXz&I7NBi}!F5^~C6);CeMotzAg@3#vNhA_|<KyE8a5r7ir3PU4pcoZ{VpJSA zF3vyq$?H!6j|0(oJbpNr%Po1CKbB?PoSU0_Q$nfbIiuhvEC6cA|ICZ$j$DnM?uq~# znx-xF_V#|bwzl@CR}QJF+7gS!t}HApd;o+LMe!kRDs|zlkHdlXgBRZUx#P^M&48|H z+M?G$0IjX9UnUZXgFsLz5m6zb)Nr8vz!z^{+5gd@W?)^@w1u9Yo>N`}b#`{1MIP6- z-Bb+++F$sr?>tZh)@NpBGAk=9H@t+2L?W+A7~i%q=7w?OmlNNe$92w5rBX-R+S(3z z2_qE*)QXJ@ptxRGx_0E!$-l4vu?G0l>GZK^H2P^BKtN866=59HE{ykleJZOhW&ksl zO1&SAMlaNZLKap56^f2y+J)cGT|JZ47XJb^XJ=>M>*(mH3kX0alex~;%uExoZ%~Yi z0rOJ+`Lk~f05PB?nM{7{IF6U~?td~(GvD3a{R(b@4T3vkw4AWM*?8&mw~hhN0(*fy zwr$r9q*yF&4h;?U1FgU=<Y*BF9__l^-v{iIln(=Y>jjZcrzhg^_+j8_;1TJHqTn{l zpbQ7MrT{!t2G+n1o*X++Y5fAQ4(LE0Foh6KwIBF#`&AQLV}%!TaFg{mV92n95Drw| oZD|HBe>Hj`!QHP;A>_#UAA8GXy&%m~=l}o!07*qoM6N<$g7a9_wEzGB
literal 0 HcmV?d00001
diff --git a/src/public/images/administer_nav_users_icon.png b/src/public/images/administer_nav_users_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4b33879b365e51f054af4c70fcdc552f104cc066 GIT binary patch literal 552 zcmV+@0@wYCP)<h;3K|Lk000e1NJLTq001BW000#T1^@s6C(Z2Y00004b3#c}2nYxW zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs6m&&cbVG7wVRUJ4ZXi@?ZDjyCFEKAMF(>hsDF6Tgf=NU{ zR7i=vm9b94Fcd}4LzU=)+Kp^v?1GvJvC&WH$Y<~=jEt}`@&ia^>llfpZ0Xi+Wh>KV zr~@Xole9pu6v=shzV}3l9oR#XGD%PRRxWA0kJmooeMu{YH97>qZ6sWh^1lp9B&C6R zQ3IgrnwU?iP9%H`4BdEXW_RB7Sp$0t6fJxJI0}R(<szq3NrQ&aEw%O80sy*!TCyuZ zTc5T7zKVwVRZE{Jz$#E%c;lBEzrxJQozUbH1~9WlrEzU$Gw=Ss2H;@_pD=*an>Suo z04Ky>LlrLS69sTzZ|ar$uI6hVGBdL;u$DfUw;%&D;`@9K<YtyjngCY;0Ncd}z}zWy z4ID=n`04}azy)v;n12Rd34ef9eE^Rp=?3UEG^cEyDr;d3kh`mB=zH(fgm-}faLMim zQ3<;MroaqX2l{%!e*rLZ!L1IH8YRHkg-?M=wIQ?(GY9b7a9>^Lx%CRIT5$jLVYU88 qnwweL1fYKk-vpZd$c&wY2h%5x6!$=@*)N9x0000<MNUMnLSTZ;(ch2&
literal 0 HcmV?d00001
--- src/app/stylesheets/custom.scss | 20 -------------------- src/app/stylesheets/layout.scss | 10 ++++++++-- 2 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/src/app/stylesheets/custom.scss b/src/app/stylesheets/custom.scss index a81a508..9a57a62 100644 --- a/src/app/stylesheets/custom.scss +++ b/src/app/stylesheets/custom.scss @@ -24,26 +24,6 @@ border-radius: 0em 50em 50em 0em; }
-/*fixes scrollbar and footer issues*/ -#primary-container{ - margin-bottom: -40px; -} - -div#content{ - margin-bottom: 58px; -} - -.clearfooter{ - height: 40px; - clear: both; -} - -footer.standard{ - nav.footer{ - padding: 14px 14px 13px 14px; - } -} - .deployable_details .content li { list-style-type: none; } diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index 5614305..9b1ae0b 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -248,6 +248,7 @@ strong, em, b, i{ font-family: $font-family-em; } position: relative; min-height: 100%; display: block; + margin-bottom: -40px; }
/* Content */ @@ -269,7 +270,7 @@ body.administer div#content{
div#content{ margin: 0 auto; - margin-bottom: 98px; + margin-bottom: 58px; min-height: 200px; -webkit-border-radius: 7px; -moz-border-radius: 7px; border-radius: 7px; background-color: #FAFAFA; @@ -2168,6 +2169,11 @@ form.generic{ Page Footer -- v.0.0.1 [footer] (footer.scss) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+.clearfooter{ + height: 40px; + clear: both; +} + /* Footer */
footer.standard{ @@ -2198,7 +2204,7 @@ footer.standard{
nav.footer{ display: inline-block; - padding: 14px; + padding: 14px 14px 13px 14px; a{ color: #fff; padding-right: 6px;
On 09/01/2011 04:42 PM, Jiri Tomasek wrote:
Folowing patches implement new administer section navigation and bring some changes and polishing to layout.scss.
The administer section navigation is kind of work in progress...
aeolus-devel mailing list aeolus-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/aeolus-devel
Nice to see this thing getting started.
In case you've missed it, I'm getting a bunch of deprecation warning when running the cucumber tests. Here's a sample:
DEPRECATION WARNING: - style block helpers are deprecated. Please use =. (called from _app_views_layouts__admin_header_haml__2127617113_70349342409220_4093150 at /home/thomas/aeolus/conductor/src/app/views/layouts/_admin_header.haml:4) DEPRECATION WARNING: - style block helpers are deprecated. Please use =. (called from _app_views_layouts__admin_header_haml__2127617113_70349342409220_4093150 at /home/thomas/aeolus/conductor/src/app/views/layouts/_admin_header.haml:7) DEPRECATION WARNING: - style block helpers are deprecated. Please use =. (called from _app_views_layouts__admin_header_haml__2127617113_70349342409220_4093150 at /home/thomas/aeolus/conductor/src/app/views/layouts/_admin_header.haml:10) DEPRECATION WARNING: - style block helpers are deprecated. Please use =. (called from _app_views_layouts__admin_header_haml__2127617113_70349342409220_4093150 at /home/thomas/aeolus/conductor/src/app/views/layouts/_admin_header.haml:13)
Otherwise it's great, ACK. But since this is a work in progress and some parts of the Admin section (like Provider Accounts or Hardware Profiles) are not accessible yet, could you please push it to a separate branch dedicated to the admin rework?
That way we won't break people who are not working directly on the UI.
Cheers, Thomas
aeolus-devel@lists.fedorahosted.org