diff options
| author | Adam Young <ayoung@redhat.com> | 2010-09-24 10:47:40 -0400 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2010-09-24 20:51:09 -0400 |
| commit | 65b455edf97742a922e51a5d81001ce106ec0043 (patch) | |
| tree | a43801c7a90fc367947a7f7cd9f28a6326697e02 /install | |
| parent | 346615d4a0029fb3f59344a98963b7fea8356b8c (diff) | |
| download | freeipa-65b455edf97742a922e51a5d81001ce106ec0043.tar.gz freeipa-65b455edf97742a922e51a5d81001ce106ec0043.tar.xz freeipa-65b455edf97742a922e51a5d81001ce106ec0043.zip | |
Whoami link
The 'logged in as' message in the header into an active hypoerlink that loads the details page for the current user.
Also fixed a bug where, when reloading, the search page would fail due to scl being undefined.
Fixed a typo
replaced {'user-facet':'details', 'pkey':whoami_pkey},2);
with {'user-facet':'details', 'user-pkey':whoami_pkey},2);
Diffstat (limited to 'install')
| -rw-r--r-- | install/static/index.xhtml | 2 | ||||
| -rw-r--r-- | install/static/ipa.css | 3 | ||||
| -rw-r--r-- | install/static/search.js | 4 | ||||
| -rw-r--r-- | install/static/webui.js | 9 |
4 files changed, 14 insertions, 4 deletions
diff --git a/install/static/index.xhtml b/install/static/index.xhtml index 3fcb5f625..062a4a7f1 100644 --- a/install/static/index.xhtml +++ b/install/static/index.xhtml @@ -40,7 +40,7 @@ <img src="ipalogo.png" /> </span> <span id="loggedinas" class="header-loggedinas"> - <a>Logged in as <strong>hardcoded@FREEIP.ORG</strong></a> + <a href="#">Logged in as <strong>hardcoded@FREEIP.ORG</strong></a> </span> </div> diff --git a/install/static/ipa.css b/install/static/ipa.css index 7e518b13c..c562a20b3 100644 --- a/install/static/ipa.css +++ b/install/static/ipa.css @@ -14,7 +14,6 @@ body{ font: 62.5% "Trebuchet MS", sans-serif; margin: 50px;} .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; @@ -39,10 +38,12 @@ div.header a { div.header a:link { text-decoration: none; + color: white; } div.header a:visited { text-decoration: none; + color: white; } div.header div.header-logo { diff --git a/install/static/search.js b/install/static/search.js index 7347dfceb..6c88e41a6 100644 --- a/install/static/search.js +++ b/install/static/search.js @@ -23,6 +23,10 @@ function search_create(obj_name, scl, container) { + if (!scl){ + scl = []; + } + function find_on_click() { var filter = $(this).prev('input[type=text]').val(); var state = {}; diff --git a/install/static/webui.js b/install/static/webui.js index 09ed70929..1a37aaa34 100644 --- a/install/static/webui.js +++ b/install/static/webui.js @@ -37,7 +37,7 @@ var admin_tabs_lists = [ ]; -var self_serv_tabs_lists = +var self_serv_tabs_lists = [ ['identity', 'IDENTITY', [ ['user', 'Users', ipa_entity_setup]]]]; @@ -47,11 +47,16 @@ var nav_tabs_lists; /* main (document onready event handler) */ $(function() { + var whoami_pkey; + function whoami_on_win(data, text_status, xhr) { $(window).bind('hashchange', window_hashchange); if (!data.error){ var whoami = data.result.result[0]; + whoami_pkey=whoami.uid[0]; $('#loggedinas').find('strong').text(whoami.krbprincipalname[0]); + $('#loggedinas a').fragment( + {'user-facet':'details', 'user-pkey':whoami_pkey},2); if (whoami.hasOwnProperty('memberof_rolegroup') && whoami.memberof_rolegroup.length > 0){ nav_tabs_lists = admin_tabs_lists; @@ -59,7 +64,7 @@ $(function() { }else{ nav_tabs_lists = self_serv_tabs_lists; - var state = {'user-pkey': whoami.uid[0], + var state = {'user-pkey':whoami_pkey , 'user-facet': jQuery.bbq.getState('user-facet') || 'details'}; $.bbq.pushState(state); |