diff options
-rwxr-xr-x | _graphics/favicon.ico | bin | 0 -> 1218 bytes | |||
-rw-r--r-- | start.php | 72 | ||||
-rw-r--r-- | views/default/css/elements/forms.php | 23 | ||||
-rw-r--r-- | views/default/css/elements/icons.php | 6 | ||||
-rw-r--r-- | views/default/css/elements/modules.php | 10 | ||||
-rw-r--r-- | views/default/n1_theme/css.php | 35 | ||||
-rw-r--r-- | views/default/page/elements/shortcut_icon.php | 6 |
7 files changed, 132 insertions, 20 deletions
diff --git a/_graphics/favicon.ico b/_graphics/favicon.ico Binary files differnew file mode 100755 index 0000000..f3524a5 --- /dev/null +++ b/_graphics/favicon.ico @@ -28,7 +28,77 @@ 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_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' => "<span class=\"messages-new\">$num_invitations</span>",
+ 'href' => "groups/invitations/$user->username",
+ ));
+ }
+
+ $returnvalue[] = ElggMenuItem::factory(array(
+ 'name' => 'groups',
+ 'href' => "groups/member/$user->username",
+ 'text' => elgg_view_icon('groups') . $num_invitations,
+ 'title' => elgg_echo('groups'),
+ 'priority' => 500,
+ ));
+ }
+
+ 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/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; } diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php index ed1a587..07d1461 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-icon-group, .elgg-menu-item-group a { background-position: 0 -1560px; 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; diff --git a/views/default/n1_theme/css.php b/views/default/n1_theme/css.php index db9fa46..aa1f677 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('<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/privacy.png'); @@ -89,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; @@ -105,3 +129,12 @@ background-color: #F7F7F7 !important; border: none !important; } + +/* BeeChat */ +div#beechat_contacts_top { + background-color: #333333; +} + +div.beechat_chatbox_top { + background-color: #333333; +} 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 @@ +<?php
+/**
+ * Displays the default shortcut icon
+ */
+?>
+<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/favicon.ico" />
|