On 09/17/2010 10:36 AM, Adam Young wrote:
css tabs and facets
includes Makfile changes to get images to deploy
Note that the Makefile changes are undone by a later patch.
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
From 8eebec8ef81d203e39bb4d42b3557320b4595827 Mon Sep 17 00:00:00 2001
From: Adam Young ayo...@redhat.com
Date: Thu, 16 Sep 2010 15:13:48 -0400
Subject: [PATCH 29/33] css tabs and facets
includes Makfile changes to get images to deploy
---
install/static/Makefile.am|4 ++
install/static/entity.js | 12 ---
install/static/images/Makefile.am | 28 ++
install/static/ipa.css| 71 +
install/static/navigation.js |7 ++--
5 files changed, 91 insertions(+), 31 deletions(-)
create mode 100644 install/static/images/Makefile.am
diff --git a/install/static/Makefile.am b/install/static/Makefile.am
index 884c8bf..748ccf1 100644
--- a/install/static/Makefile.am
+++ b/install/static/Makefile.am
@@ -1,5 +1,9 @@
NULL =
+SUBDIRS = \
+ images\
+ $(NULL)
+
appdir = $(IPA_DATA_DIR)/static
app_DATA = \
add.js\
diff --git a/install/static/entity.js b/install/static/entity.js
index ea7292e..7aec565 100644
--- a/install/static/entity.js
+++ b/install/static/entity.js
@@ -131,17 +131,19 @@ function ipa_entity_generate_views(obj_name, container)
var ul = $('ul/ul', {'class': 'entity-views'});
+//TODO replace the plus image with the correct image for each facet
ul.append($('li/li', {
-text: 'Back to Search',
title: 'search',
click: switch_view
-}));
+})).append('img src=plus-enabled.png/')
+.append('Search') ;
ul.append($('li/li', {
text: 'Details',
title: 'details',
click: switch_view
-}));
+})).append('img src=plus-enabled.png/')
+.append('Details') ;
var attribute_members = ipa_objs[obj_name].attribute_members;
for (attr in attribute_members) {
@@ -151,10 +153,10 @@ function ipa_entity_generate_views(obj_name, container)
var label = ipa_objs[m].label;
ul.append($('li/li', {
-text: label,
title: m,
click: switch_view
-}));
+})).append('img src=plus-enabled.png/')
+.append(label);
}
}
diff --git a/install/static/images/Makefile.am b/install/static/images/Makefile.am
new file mode 100644
index 000..cc122a4
--- /dev/null
+++ b/install/static/images/Makefile.am
@@ -0,0 +1,28 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/static
+app_DATA = \
+ui-bg_flat_65_ff_40x100.png \
+ui-bg_glass_40_11_1x400.png \
+ui-bg_glass_55_1c1c1c_1x400.png \
+ui-bg_highlight-hard_100_f9f9f9_1x100.png\
+ui-bg_highlight-hard_40_aa_1x100.png \
+ui-bg_highlight-soft_50_aa_1x100.png \
+ui-bg_inset-hard_45_cd0a0a_1x100.png \
+ui-bg_inset-hard_55_ffeb80_1x100.png \
+ui-bg_loop_8_33_21x21.png\
+ui-icons_22_256x240.png \
+ui-icons_4ca300_256x240.png \
+ui-icons_bb_256x240.png \
+ui-icons_ededed_256x240.png \
+ui-icons_ffcf29_256x240.png \
+ui-icons_ff_256x240.png \
+ $(NULL)
+
+EXTRA_DIST =\
+$(app_DATA) \
+$(NULL)
+
+MAINTAINERCLEANFILES = \
+*~ \
+Makefile.in
diff --git a/install/static/ipa.css b/install/static/ipa.css
index d3cb6fb..0c12fd3 100644
--- a/install/static/ipa.css
+++ b/install/static/ipa.css
@@ -8,8 +8,14 @@
body {
font-family: sans-serif;
font-size: 14pt;
+margin: 25px;
}
+/*demo page css*/
+.demoHeaders { margin-top: 2em; }
+.input_link {padding: .4em 1em .4em 20px;text-decoration: none;position: relative;}
+.input_link span.ui-icon {margin: 0 5px 0 0;position: absolute;left: .2em;top: 50%;margin-top: -8px;}
+
a {
text-decoration: none;
border: 0;
@@ -175,51 +181,61 @@ span.attrhint {
/*Navigation */
-span.sub-nav-off a:link, span.sub-nav-off a:visited{
-color:white;
-}
-span.main-nav-off a:link, span.main-nav-off a:visited{
-color:white;
+.tabs1 .ui-tabs-nav{
+padding: 0.1em;
+
}
-#main-nav{
+.tabs1 .ui-tabs-nav {
background-image: url(Mainnav-background.png);
-font-size: 100%;
}
-span.main-nav-on{
-background-image: url(Mainnav-ontab.png);
+.tabs1 .ui-tabs-nav li a:link, span.main-nav-off a:visited{
+color:white;
}
-span.main-nav-off{
-background-image: url(Mainnav-offtab.png);
