From d8b4e68221f32fa95c149fc125850f042a38e537 Mon Sep 17 00:00:00 2001 From: Adam Young Date: Fri, 15 Oct 2010 16:12:34 -0400 Subject: removing icons We'll later replace them with a new scheme. For now, this is the simplest UI The intention is to look unfinished, so people don't comment on how poor it looks. --- install/static/Makefile.am | 26 -------------------------- install/static/but-reset.png | Bin 1368 -> 0 bytes install/static/but-selected.png | Bin 401 -> 0 bytes install/static/but-unselected.png | Bin 423 -> 0 bytes install/static/but-update.png | Bin 1649 -> 0 bytes install/static/entity.js | 15 ++++++--------- install/static/group_details.png | Bin 1017 -> 0 bytes install/static/group_enroll.png | Bin 998 -> 0 bytes install/static/group_member.png | Bin 1045 -> 0 bytes install/static/host_details.png | Bin 724 -> 0 bytes install/static/host_enroll.png | Bin 599 -> 0 bytes install/static/host_member.png | Bin 657 -> 0 bytes install/static/hostgroup_details.png | Bin 834 -> 0 bytes install/static/hostgroup_enroll.png | Bin 794 -> 0 bytes install/static/hostgroup_member.png | Bin 751 -> 0 bytes install/static/ipa.css | 1 + install/static/minus-disabled.png | Bin 521 -> 0 bytes install/static/minus-enabled.png | Bin 522 -> 0 bytes install/static/minus-hover.png | Bin 379 -> 0 bytes install/static/netgroup_details.png | Bin 1037 -> 0 bytes install/static/netgroup_enroll.png | Bin 956 -> 0 bytes install/static/netgroup_member.png | Bin 1017 -> 0 bytes install/static/plus-disabled.png | Bin 560 -> 0 bytes install/static/plus-enabled.png | Bin 561 -> 0 bytes install/static/plus-hover.png | Bin 409 -> 0 bytes install/static/rolegroup_details.png | Bin 561 -> 0 bytes install/static/rolegroup_member.png | Bin 561 -> 0 bytes install/static/search.png | Bin 480 -> 0 bytes install/static/service_details.png | Bin 964 -> 0 bytes install/static/service_enroll.png | Bin 933 -> 0 bytes install/static/service_member.png | Bin 944 -> 0 bytes install/static/taskgroup_details.png | Bin 561 -> 0 bytes install/static/user_details.png | Bin 894 -> 0 bytes install/static/user_enroll.png | Bin 826 -> 0 bytes install/static/user_member.png | Bin 894 -> 0 bytes 35 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 install/static/but-reset.png delete mode 100644 install/static/but-selected.png delete mode 100644 install/static/but-unselected.png delete mode 100644 install/static/but-update.png delete mode 100644 install/static/group_details.png delete mode 100644 install/static/group_enroll.png delete mode 100644 install/static/group_member.png delete mode 100644 install/static/host_details.png delete mode 100644 install/static/host_enroll.png delete mode 100644 install/static/host_member.png delete mode 100644 install/static/hostgroup_details.png delete mode 100644 install/static/hostgroup_enroll.png delete mode 100644 install/static/hostgroup_member.png delete mode 100644 install/static/minus-disabled.png delete mode 100644 install/static/minus-enabled.png delete mode 100644 install/static/minus-hover.png delete mode 100644 install/static/netgroup_details.png delete mode 100644 install/static/netgroup_enroll.png delete mode 100644 install/static/netgroup_member.png delete mode 100644 install/static/plus-disabled.png delete mode 100644 install/static/plus-enabled.png delete mode 100644 install/static/plus-hover.png delete mode 100644 install/static/rolegroup_details.png delete mode 100644 install/static/rolegroup_member.png delete mode 100644 install/static/search.png delete mode 100644 install/static/service_details.png delete mode 100644 install/static/service_enroll.png delete mode 100644 install/static/service_member.png delete mode 100644 install/static/taskgroup_details.png delete mode 100644 install/static/user_details.png delete mode 100644 install/static/user_enroll.png delete mode 100644 install/static/user_member.png diff --git a/install/static/Makefile.am b/install/static/Makefile.am index 362b7d05..ef16a2e9 100644 --- a/install/static/Makefile.am +++ b/install/static/Makefile.am @@ -9,10 +9,6 @@ appdir = $(IPA_DATA_DIR)/static app_DATA = \ add.js \ associate.js \ - but-reset.png \ - but-update.png \ - but-selected.png \ - but-unselected.png \ ipa_logo_180x50.png \ ipa.js \ ipa.css \ @@ -59,28 +55,6 @@ app_DATA = \ ui-icons_ededed_256x240.png \ ui-icons_ffcf29_256x240.png \ ui-icons_ffffff_256x240.png \ - group_details.png \ - host_details.png \ - hostgroup_details.png \ - netgroup_details.png \ - service_details.png \ - user_details.png \ - group_member.png \ - host_member.png \ - hostgroup_member.png \ - netgroup_member.png \ - service_member.png \ - user_member.png \ - group_enroll.png \ - host_enroll.png \ - hostgroup_enroll.png \ - netgroup_enroll.png \ - service_enroll.png \ - user_enroll.png \ - search.png \ - taskgroup_details.png \ - rolegroup_details.png \ - rolegroup_member.png \ $(NULL) EXTRA_DIST = \ diff --git a/install/static/but-reset.png b/install/static/but-reset.png deleted file mode 100644 index c2c4db1e..00000000 Binary files a/install/static/but-reset.png and /dev/null differ diff --git a/install/static/but-selected.png b/install/static/but-selected.png deleted file mode 100644 index 9a42053a..00000000 Binary files a/install/static/but-selected.png and /dev/null differ diff --git a/install/static/but-unselected.png b/install/static/but-unselected.png deleted file mode 100644 index ba9ed332..00000000 Binary files a/install/static/but-unselected.png and /dev/null differ diff --git a/install/static/but-update.png b/install/static/but-update.png deleted file mode 100644 index 719b651b..00000000 Binary files a/install/static/but-update.png and /dev/null differ diff --git a/install/static/entity.js b/install/static/entity.js index 913a751c..9f3149bd 100644 --- a/install/static/entity.js +++ b/install/static/entity.js @@ -208,13 +208,13 @@ function ipa_entity_generate_views(obj_name, container, switch_view) title: 'search', text: 'Search', click: switch_view - }).prepend('')); + })); ul.append($('
  • ', { text: 'Details', title: 'details', click: switch_view - }).prepend('')); + }).prepend('| ')); var attribute_members = ipa_objs[obj_name].attribute_members; for (attr in attribute_members) { @@ -227,7 +227,7 @@ function ipa_entity_generate_views(obj_name, container, switch_view) title: m, text:label, click: switch_view - }).prepend('')); + }).prepend('| ')); } } @@ -253,9 +253,7 @@ function ipa_entity_quick_links(tr, attr, value, entry_attrs) { nav_push_state(state); return false; } - }).append($('', { - src: obj_name+'_details.png' - })).appendTo(td); + }).appendTo(td); var attribute_members = ipa_objs[obj_name].attribute_members; for (attr_name in attribute_members) { @@ -267,6 +265,7 @@ function ipa_entity_quick_links(tr, attr, value, entry_attrs) { $("", { href: '#'+m, title: label, + text: label, click: function(m) { return function() { var state = {}; @@ -277,9 +276,7 @@ function ipa_entity_quick_links(tr, attr, value, entry_attrs) { return false; } }(m) - }).append($('', { - src: m+'_member.png' - })).appendTo(td); + }).append(' | ' ).appendTo(td); } } } diff --git a/install/static/group_details.png b/install/static/group_details.png deleted file mode 100644 index c267398a..00000000 Binary files a/install/static/group_details.png and /dev/null differ diff --git a/install/static/group_enroll.png b/install/static/group_enroll.png deleted file mode 100644 index ad6b1c1d..00000000 Binary files a/install/static/group_enroll.png and /dev/null differ diff --git a/install/static/group_member.png b/install/static/group_member.png deleted file mode 100644 index 4e754147..00000000 Binary files a/install/static/group_member.png and /dev/null differ diff --git a/install/static/host_details.png b/install/static/host_details.png deleted file mode 100644 index 16f748a1..00000000 Binary files a/install/static/host_details.png and /dev/null differ diff --git a/install/static/host_enroll.png b/install/static/host_enroll.png deleted file mode 100644 index 3f3112dc..00000000 Binary files a/install/static/host_enroll.png and /dev/null differ diff --git a/install/static/host_member.png b/install/static/host_member.png deleted file mode 100644 index 71bae959..00000000 Binary files a/install/static/host_member.png and /dev/null differ diff --git a/install/static/hostgroup_details.png b/install/static/hostgroup_details.png deleted file mode 100644 index b376d883..00000000 Binary files a/install/static/hostgroup_details.png and /dev/null differ diff --git a/install/static/hostgroup_enroll.png b/install/static/hostgroup_enroll.png deleted file mode 100644 index 0a8cafd6..00000000 Binary files a/install/static/hostgroup_enroll.png and /dev/null differ diff --git a/install/static/hostgroup_member.png b/install/static/hostgroup_member.png deleted file mode 100644 index 8c18ded7..00000000 Binary files a/install/static/hostgroup_member.png and /dev/null differ diff --git a/install/static/ipa.css b/install/static/ipa.css index eb5396db..f8b74bca 100644 --- a/install/static/ipa.css +++ b/install/static/ipa.css @@ -274,6 +274,7 @@ span.main-separator{ .entity-views li { display:inline; cursor: pointer; + padding: 3px; } .strikethrough { text-decoration: line-through; } diff --git a/install/static/minus-disabled.png b/install/static/minus-disabled.png deleted file mode 100644 index 3dcbd72b..00000000 Binary files a/install/static/minus-disabled.png and /dev/null differ diff --git a/install/static/minus-enabled.png b/install/static/minus-enabled.png deleted file mode 100644 index 5a98ebbb..00000000 Binary files a/install/static/minus-enabled.png and /dev/null differ diff --git a/install/static/minus-hover.png b/install/static/minus-hover.png deleted file mode 100644 index 7875dbe1..00000000 Binary files a/install/static/minus-hover.png and /dev/null differ diff --git a/install/static/netgroup_details.png b/install/static/netgroup_details.png deleted file mode 100644 index dba8cd26..00000000 Binary files a/install/static/netgroup_details.png and /dev/null differ diff --git a/install/static/netgroup_enroll.png b/install/static/netgroup_enroll.png deleted file mode 100644 index d8b6413f..00000000 Binary files a/install/static/netgroup_enroll.png and /dev/null differ diff --git a/install/static/netgroup_member.png b/install/static/netgroup_member.png deleted file mode 100644 index 8fddc243..00000000 Binary files a/install/static/netgroup_member.png and /dev/null differ diff --git a/install/static/plus-disabled.png b/install/static/plus-disabled.png deleted file mode 100644 index cb0e874f..00000000 Binary files a/install/static/plus-disabled.png and /dev/null differ diff --git a/install/static/plus-enabled.png b/install/static/plus-enabled.png deleted file mode 100644 index 74882af7..00000000 Binary files a/install/static/plus-enabled.png and /dev/null differ diff --git a/install/static/plus-hover.png b/install/static/plus-hover.png deleted file mode 100644 index e9b2278c..00000000 Binary files a/install/static/plus-hover.png and /dev/null differ diff --git a/install/static/rolegroup_details.png b/install/static/rolegroup_details.png deleted file mode 100644 index 74882af7..00000000 Binary files a/install/static/rolegroup_details.png and /dev/null differ diff --git a/install/static/rolegroup_member.png b/install/static/rolegroup_member.png deleted file mode 100644 index 74882af7..00000000 Binary files a/install/static/rolegroup_member.png and /dev/null differ diff --git a/install/static/search.png b/install/static/search.png deleted file mode 100644 index ecab81b3..00000000 Binary files a/install/static/search.png and /dev/null differ diff --git a/install/static/service_details.png b/install/static/service_details.png deleted file mode 100644 index 4d8542f9..00000000 Binary files a/install/static/service_details.png and /dev/null differ diff --git a/install/static/service_enroll.png b/install/static/service_enroll.png deleted file mode 100644 index ffc6f108..00000000 Binary files a/install/static/service_enroll.png and /dev/null differ diff --git a/install/static/service_member.png b/install/static/service_member.png deleted file mode 100644 index 2368856e..00000000 Binary files a/install/static/service_member.png and /dev/null differ diff --git a/install/static/taskgroup_details.png b/install/static/taskgroup_details.png deleted file mode 100644 index 74882af7..00000000 Binary files a/install/static/taskgroup_details.png and /dev/null differ diff --git a/install/static/user_details.png b/install/static/user_details.png deleted file mode 100644 index 0b43f8e7..00000000 Binary files a/install/static/user_details.png and /dev/null differ diff --git a/install/static/user_enroll.png b/install/static/user_enroll.png deleted file mode 100644 index 38d3e2d7..00000000 Binary files a/install/static/user_enroll.png and /dev/null differ diff --git a/install/static/user_member.png b/install/static/user_member.png deleted file mode 100644 index ae556b02..00000000 Binary files a/install/static/user_member.png and /dev/null differ -- cgit