From 1e503286839742e72c01a6357c4293b7bf390d56 Mon Sep 17 00:00:00 2001 From: Sem Date: Tue, 23 Oct 2012 06:20:08 +0200 Subject: Overrided topbar icons with tooltips. --- start.php | 44 +++++++++++++++++++++++++++++++++++++++++- views/default/n1_theme/css.php | 15 ++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/start.php b/start.php index 43d175f..eb25a82 100644 --- a/start.php +++ b/start.php @@ -28,7 +28,49 @@ function n1_theme_init() { } function n1_theme_topbar_menu($hook, $type, $returnvalue, $params){ - //var_dump($returnvalue);exit(); + $user = elgg_get_logged_in_user_entity(); + + if (elgg_is_admin_logged_in()) { + $returnvalue[] = ElggMenuItem::factory(array( + 'name' => 'administration', + 'href' => "admin", + 'text' => elgg_view_icon('settings'), + 'title' => elgg_echo('admin'), + 'priority' => 100, + 'section' => 'alt', + )); + } + + if (elgg_is_active_plugin('dashboard')) { + $returnvalue[] = ElggMenuItem::factory(array( + 'name' => 'dashboard', + 'href' => "dashboard", + 'text' => elgg_view_icon('home'), + 'title' => elgg_echo('dashboard'), + 'priority' => 200, + 'section' => 'alt', + )); + } + + $returnvalue[] = ElggMenuItem::factory(array( + 'name' => 'usersettings', + 'href' => "settings/user/{$user->username}", + 'text' => elgg_view_icon('settings-alt'), + 'title' => elgg_echo('settings'), + 'priority' => 500, + 'section' => 'alt', + )); + + $returnvalue[] = ElggMenuItem::factory(array( + 'name' => 'logout', + 'href' => "action/logout", + 'text' => elgg_echo('logout'), + 'title' => elgg_echo('logout'), + 'is_action' => TRUE, + 'priority' => 1000, + 'section' => 'alt', + )); + return $returnvalue; } /** diff --git a/views/default/n1_theme/css.php b/views/default/n1_theme/css.php index db9fa46..be935d4 100644 --- a/views/default/n1_theme/css.php +++ b/views/default/n1_theme/css.php @@ -26,6 +26,21 @@ font-weight: bold; } +.messages-new { + background-color: #FF4C12; + border-radius: 10px; + box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.5); + color: black; + font-size: 10px; + font-weight: bold; + height: 16px; + left: 20px; + min-width: 16px; + position: absolute; + text-align: center; + top: 12px; +} + .elgg-access, .elgg-input-access > option { padding-left: 19px; background-image: url('mod/n1_theme/_graphics/privacy.png'); -- cgit v1.2.3 From e1f501a4988ccf4b88dec72b19955101a0a706e3 Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Wed, 24 Oct 2012 01:44:51 +0000 Subject: change featured block colours specially for custom_index_widgets. --- views/default/css/elements/modules.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php index a9ac965..28332bb 100644 --- a/views/default/css/elements/modules.php +++ b/views/default/css/elements/modules.php @@ -89,15 +89,15 @@ /* Featured */ .elgg-module-featured { - border: 1px solid #ff4c12; + border: 1px solid #333; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .elgg-module-featured > .elgg-head { padding: 5px; - background-color: #ff4c12; + background-color: #333; } .elgg-module-featured > .elgg-head * { color: white; -- cgit v1.2.3 From 6429d85c0ed092687d7d335157ab481fc72602f9 Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Wed, 24 Oct 2012 04:01:05 +0000 Subject: add favicon to theme. --- _graphics/favicon.ico | Bin 0 -> 1218 bytes views/default/page/elements/shortcut_icon.php | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100755 _graphics/favicon.ico create mode 100644 views/default/page/elements/shortcut_icon.php diff --git a/_graphics/favicon.ico b/_graphics/favicon.ico new file mode 100755 index 0000000..f3524a5 Binary files /dev/null and b/_graphics/favicon.ico differ diff --git a/views/default/page/elements/shortcut_icon.php b/views/default/page/elements/shortcut_icon.php new file mode 100644 index 0000000..7fd33f6 --- /dev/null +++ b/views/default/page/elements/shortcut_icon.php @@ -0,0 +1,6 @@ + + -- cgit v1.2.3 From d2162850441b37eba7b83b47c2afa2b4184274d3 Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Thu, 25 Oct 2012 09:26:25 +0000 Subject: set colors for chat boxes. --- views/default/n1_theme/css.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/views/default/n1_theme/css.php b/views/default/n1_theme/css.php index be935d4..986efe3 100644 --- a/views/default/n1_theme/css.php +++ b/views/default/n1_theme/css.php @@ -120,3 +120,12 @@ background-color: #F7F7F7 !important; border: none !important; } + +/* BeeChat */ +div#beechat_contacts_top { + background-color: #333333; +} + +div.beechat_chatbox_top { + background-color: #333333; +} -- cgit v1.2.3 From b4ad2436f397f5f9f155a723f4a07bb3cc7eb32a Mon Sep 17 00:00:00 2001 From: Sem Date: Tue, 30 Oct 2012 02:32:04 +0100 Subject: Added groups icon in topbar. --- _graphics/elgg_sprites.png | Bin 26601 -> 27129 bytes start.php | 12 +++++++++++- views/default/css/elements/icons.php | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/_graphics/elgg_sprites.png b/_graphics/elgg_sprites.png index b8b9b2b..461799c 100644 Binary files a/_graphics/elgg_sprites.png and b/_graphics/elgg_sprites.png differ diff --git a/start.php b/start.php index eb25a82..ae5f3d6 100644 --- a/start.php +++ b/start.php @@ -29,7 +29,17 @@ function n1_theme_init() { function n1_theme_topbar_menu($hook, $type, $returnvalue, $params){ $user = elgg_get_logged_in_user_entity(); - + + if (elgg_is_active_plugin('groups')) { + $returnvalue[] = ElggMenuItem::factory(array( + 'name' => 'groups', + 'href' => $user ? "groups/member/$user->username" : "groups/all", + 'text' => elgg_view_icon('groups'), + 'title' => elgg_echo('groups'), + 'priority' => 500, + )); + } + if (elgg_is_admin_logged_in()) { $returnvalue[] = ElggMenuItem::factory(array( 'name' => 'administration', diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php index ba62a66..2d6db62 100644 --- a/views/default/css/elements/icons.php +++ b/views/default/css/elements/icons.php @@ -281,6 +281,12 @@ .elgg-icon-logout:hover, .elgg-menu-item-logout:hover a { background-position: 0 -1542px; } +.elgg-icon-groups { + background-position: 0 -1577px; +} +.elgg-icon-groups:hover { + background-position: 0 -1560px; +} .elgg-avatar > .elgg-icon-hover-menu { -- cgit v1.2.3 From 971504c5c53593d63d74714acf3ae7321ec557c4 Mon Sep 17 00:00:00 2001 From: Sem Date: Tue, 30 Oct 2012 02:52:43 +0100 Subject: Added group invitations in groups topbar icon. --- start.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/start.php b/start.php index ae5f3d6..65ea0e5 100644 --- a/start.php +++ b/start.php @@ -31,10 +31,28 @@ function n1_theme_topbar_menu($hook, $type, $returnvalue, $params){ $user = elgg_get_logged_in_user_entity(); if (elgg_is_active_plugin('groups')) { + + $ia = elgg_set_ignore_access(TRUE); + $num_invitations = elgg_get_entities_from_relationship(array( + 'relationship' => 'invited', + 'relationship_guid' => $user->guid, + 'inverse_relationship' => TRUE, + 'limit' => 0, + 'count' => TRUE, + )); + elgg_set_ignore_access($ia); + + if ($num_invitations) { + $num_invitations = elgg_view('output/url', array( + 'text' => "$num_invitations", + 'href' => "groups/invitations/$user->username", + )); + } + $returnvalue[] = ElggMenuItem::factory(array( 'name' => 'groups', - 'href' => $user ? "groups/member/$user->username" : "groups/all", - 'text' => elgg_view_icon('groups'), + 'href' => "groups/member/$user->username", + 'text' => elgg_view_icon('groups') . $num_invitations, 'title' => elgg_echo('groups'), 'priority' => 500, )); -- cgit v1.2.3 From 22af64e512f4c77cbd9742325e93e7f330de61a4 Mon Sep 17 00:00:00 2001 From: Sem Date: Wed, 31 Oct 2012 05:17:16 +0100 Subject: Improve input/autocomplete CSS. --- views/default/css/elements/forms.php | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index c2cc433..0a5452b 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -291,27 +291,24 @@ input[type="radio"] { max-width: 600px; } .ui-autocomplete { - background-color: #333 ; + background-color: #f7f7f7; border: 1px solid #ccc; overflow: hidden; - - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; } .ui-autocomplete .ui-menu-item { padding: 0px 4px; - - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + font-weight: normal; +} +.ui-autocomplete .ui-menu-item:hover { + background-color: #eee; + cursor: pointer; } .ui-autocomplete .ui-menu-item:hover a { - text-decoration: none; - color: white; - text-shadow: 0 0 6px white; + color: #FF4C12; + background: none; + border: none; + border-radius: 0; } - .ui-combobox { height: 23px !important; } -- cgit v1.2.3 From 74895a430a7eb9a31f0555eae29e098608bdf049 Mon Sep 17 00:00:00 2001 From: Sem Date: Wed, 31 Oct 2012 17:31:12 +0100 Subject: Improved lightbox CSS. --- views/default/n1_theme/css.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/views/default/n1_theme/css.php b/views/default/n1_theme/css.php index 986efe3..aa1f677 100644 --- a/views/default/n1_theme/css.php +++ b/views/default/n1_theme/css.php @@ -104,11 +104,20 @@ margin: 10px; } +#cboxTitle, #cboxTitle h3, #cboxCurrent { + color: #000; +} #cboxTitle h3 { - color: #eee; font-weight: bold; font-size: 160%; } +#cboxOverlay { + background-color: #FFF; + opacity: 0.6 !important; +} +.event-calendar-lightbox { + padding: 5px; +} .groups-profile-icon { height: 201px; -- cgit v1.2.3