Revert "pushing changes"

This reverts commit 3c6b153eed554b634b9e85d1dc0cfe42e92094ab.

diff --git a/_graphics/elgg_sprites.png b/_graphics/elgg_sprites.png
index 7ab44ddfd58e7522b1924528f1c85211008e16cd..d22e6b4f136b294c04e95023f5ea4f7721bb45b8 100755 (executable)
Binary files a/_graphics/elgg_sprites.png and b/_graphics/elgg_sprites.png differ

diff --git a/languages/ca.php b/languages/ca.php
index 963f02d24b6a0a934455161e881fdd738380425f..d175b2c57a956144f9f921b18698b6b56a42a262 100644 (file)
--- a/languages/ca.php
+++ b/languages/ca.php
@@ -2,8 +2,8 @@
 
 $catalan = array(
 
-       'cic_theme:landing:title' => '¡Xarxes socials del poble i per al poble!',
-       'cic_theme:landing:subtitle' => 'Perquè "les eines de l\'amo mai desmontaràn la casa de l\'amo"',
+       'n1_theme:landing:title' => '¡Xarxes socials del poble i per al poble!',
+       'n1_theme:landing:subtitle' => 'Perquè "les eines de l\'amo mai desmontaràn la casa de l\'amo"',
 
 );
 

diff --git a/languages/en.php b/languages/en.php
index 0c943ffd4897cbb6c9e189368fb5b20638477249..ad5de2fc242869bd2ce255aee64524fdd909c7a8 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -2,8 +2,8 @@
 
 $english = array(
 
-       'cic_theme:landing:title' => '¡Social networks by the people and for the people!',
-       'cic_theme:landing:subtitle' => 'Because "the master\'s tools will never dismantle the master\'s house"',
+       'n1_theme:landing:title' => '¡Social networks by the people and for the people!',
+       'n1_theme:landing:subtitle' => 'Because "the master\'s tools will never dismantle the master\'s house"',
 
 );
 

diff --git a/languages/es.php b/languages/es.php
index 6a9b87fa406feb58f66e0fb9e032938f06c8e4f0..fd23fb655eae6c0d25b33564c765c675ac98c73a 100644 (file)
--- a/languages/es.php
+++ b/languages/es.php
@@ -2,8 +2,8 @@
 
 $spanish = array(
 
-       'cic_theme:landing:title' => '¡Redes sociales del pueblo y para el pueblo!',
-       'cic_theme:landing:subtitle' => 'Porque "las herramientas del amo nunca desmontarán la casa del amo"',
+       'n1_theme:landing:title' => '¡Redes sociales del pueblo y para el pueblo!',
+       'n1_theme:landing:subtitle' => 'Porque "las herramientas del amo nunca desmontarán la casa del amo"',
 
 );
 

diff --git a/manifest.xml b/manifest.xml
index 48cad2d471ba045b5d6a81a7adfcf7374b766451..daf419df52bcea987255bffe347ed142c09fbc11 100644 (file)
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
-       <name>CIC Theme</name>
+       <name>N-1 Theme</name>
        <author>Lorea</author>
        <version>1.0</version>
        <category>theme</category>
        <description>
                Modifies your Elgg site to look and behave very much like Facebook.
        </description>
-       <website>https://github.com/lorea/cic_theme</website>
+       <website>https://github.com/lorea/n1_theme</website>
        <copyright>(C) 2011 Lorea</copyright>
        <license>GNU Public License version 2</license>
        

diff --git a/start.php b/start.php
index 4c19ff4af0ccc402a852ed3dbb47b9bee68da36e..65ea0e59ff79790becbf9452b69a68e898e9fe28 100644 (file)
--- a/start.php
+++ b/start.php
@@ -1,34 +1,104 @@
 <?php\r
 \r
-elgg_register_event_handler('init', 'system', 'cic_theme_init');\r
+elgg_register_event_handler('init', 'system', 'n1_theme_init');\r
 \r
-function cic_theme_init() {\r
+function n1_theme_init() {\r
        elgg_unregister_menu_item('topbar','elgg_logo');\r
        $item =  new ElggMenuItem('site_logo', elgg_get_site_entity()->name, elgg_get_site_url());\r
        elgg_register_menu_item('topbar', $item);\r
-       elgg_register_plugin_hook_handler('register', 'menu:topbar', 'cic_theme_topbar_menu');\r
+       elgg_register_plugin_hook_handler('register', 'menu:topbar', 'n1_theme_topbar_menu');\r
        \r
-       elgg_register_simplecache_view('cic_theme/landing');\r
-       elgg_register_css('cic:landing_page', elgg_get_simplecache_url('css', 'cic_theme/landing'));\r
+       elgg_register_simplecache_view('n1_theme/landing');\r
+       elgg_register_css('n1:landing_page', elgg_get_simplecache_url('css', 'n1_theme/landing'));\r
        \r
-       elgg_extend_view('css/elgg', 'cic_theme/css');\r
-       elgg_extend_view('js/elgg', 'cic_theme/js');\r
-       elgg_extend_view('page/elements/title', 'cic_theme/header', 0);\r
+       elgg_extend_view('css/elgg', 'n1_theme/css');\r
+       elgg_extend_view('js/elgg', 'n1_theme/js');\r
+       elgg_extend_view('page/elements/title', 'n1_theme/header', 0);\r
        // custom index widgets\r
        foreach(array("custom_index", "edit_widgets", "index_2rbhh", "index_2rhhb", \r
                      "index",  "index_2rbms", "index_2rmsb",\r
                      "index_1rsss", "index_2rbsm", "index_2rsmb") as $layout) {\r
-               elgg_extend_view('page/layouts/'.$layout, 'cic_theme/landing', 0);\r
+               elgg_extend_view('page/layouts/'.$layout, 'n1_theme/landing', 0);\r
        }\r
        \r
        if (elgg_is_active_plugin('pages')) {\r
                // pages icon url override\r
-               elgg_register_plugin_hook_handler('entity:icon:url', 'object', 'cic_theme_pages_icon_url_override');\r
+               elgg_register_plugin_hook_handler('entity:icon:url', 'object', 'n1_theme_pages_icon_url_override');\r
        }\r
 }\r
 \r
-function cic_theme_topbar_menu($hook, $type, $returnvalue, $params){\r
-       //var_dump($returnvalue);exit();\r
+function n1_theme_topbar_menu($hook, $type, $returnvalue, $params){\r
+       $user = elgg_get_logged_in_user_entity();\r
+\r
+       if (elgg_is_active_plugin('groups')) {\r
+\r
+               $ia = elgg_set_ignore_access(TRUE);\r
+               $num_invitations = elgg_get_entities_from_relationship(array(\r
+                       'relationship' => 'invited',\r
+                       'relationship_guid' => $user->guid,\r
+                       'inverse_relationship' => TRUE,\r
+                       'limit' => 0,\r
+                       'count' => TRUE,\r
+               ));\r
+               elgg_set_ignore_access($ia);\r
+\r
+               if ($num_invitations) {\r
+                       $num_invitations = elgg_view('output/url', array(\r
+                               'text' => "<span class=\"messages-new\">$num_invitations</span>",\r
+                               'href' => "groups/invitations/$user->username",\r
+                       ));\r
+               }\r
+\r
+               $returnvalue[] = ElggMenuItem::factory(array(\r
+                       'name' => 'groups',\r
+                       'href' => "groups/member/$user->username",\r
+                       'text' => elgg_view_icon('groups') . $num_invitations,\r
+                       'title' => elgg_echo('groups'),\r
+                       'priority' => 500,\r
+               ));\r
+       }\r
+\r
+       if (elgg_is_admin_logged_in()) {\r
+               $returnvalue[] = ElggMenuItem::factory(array(\r
+                       'name' => 'administration',\r
+                       'href' => "admin",\r
+                       'text' => elgg_view_icon('settings'),\r
+                       'title' => elgg_echo('admin'),\r
+                       'priority' => 100,\r
+                       'section' => 'alt',\r
+               ));\r
+       }\r
+       \r
+       if (elgg_is_active_plugin('dashboard')) {\r
+               $returnvalue[] = ElggMenuItem::factory(array(\r
+                       'name' => 'dashboard',\r
+                       'href' => "dashboard",\r
+                       'text' => elgg_view_icon('home'),\r
+                       'title' => elgg_echo('dashboard'),\r
+                       'priority' => 200,\r
+                       'section' => 'alt',\r
+               ));\r
+       }\r
+\r
+       $returnvalue[] = ElggMenuItem::factory(array(\r
+               'name' => 'usersettings',\r
+               'href' => "settings/user/{$user->username}",\r
+               'text' => elgg_view_icon('settings-alt'),\r
+               'title' => elgg_echo('settings'),\r
+               'priority' => 500,\r
+               'section' => 'alt',\r
+       ));\r
+\r
+       $returnvalue[] = ElggMenuItem::factory(array(\r
+               'name' => 'logout',\r
+               'href' => "action/logout",\r
+               'text' => elgg_echo('logout'),\r
+               'title' => elgg_echo('logout'),\r
+               'is_action' => TRUE,\r
+               'priority' => 1000,\r
+               'section' => 'alt',\r
+       ));\r
+       return $returnvalue;\r
 }\r
 \r
 /**\r
@@ -36,7 +106,7 @@ function cic_theme_topbar_menu($hook, $type, $returnvalue, $params){
  *\r
  * @return string Relative URL\r
  */\r
-function cic_theme_pages_icon_url_override($hook, $type, $returnvalue, $params) {\r
+function n1_theme_pages_icon_url_override($hook, $type, $returnvalue, $params) {\r
        $entity = $params['entity'];\r
        if (elgg_instanceof($entity, 'object', 'page_top') ||\r
                elgg_instanceof($entity, 'object', 'page')) {\r
@@ -50,13 +120,13 @@ function cic_theme_pages_icon_url_override($hook, $type, $returnvalue, $params)
        switch ($params['size']) {\r
                case 'topbar':\r
                case 'tiny':\r
-                       return "mod/cic_theme/_graphics/icons/{$icon}_tiny.gif";\r
+                       return "mod/n1_theme/_graphics/icons/{$icon}_tiny.gif";\r
                        break;\r
                case 'small':\r
-                       return "mod/cic_theme/_graphics/icons/{$icon}_small.gif";\r
+                       return "mod/n1_theme/_graphics/icons/{$icon}_small.gif";\r
                        break;\r
                default:\r
-                       return "mod/cic_theme/_graphics/icons/{$icon}_lrg.gif";\r
+                       return "mod/n1_theme/_graphics/icons/{$icon}_lrg.gif";\r
                        break;\r
        }\r
 }\r

diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index c2cc4335f105b0d7c2222c0a9b17077ce3090ba3..0a5452bd6be601a8b48cf45472edfa16e36f09cd 100644 (file)
--- 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 142cbd264995361f4e80537cc3df95ce85ab25af..07d14612d11fc37257baedb54a0c5ccde319499a 100644 (file)
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -13,7 +13,7 @@
 *************************************** */
 
 .elgg-icon, .elgg-menu-item-logout a {
-       background: transparent url(<?php echo elgg_get_site_url(); ?>mod/cic_theme/_graphics/elgg_sprites.png) no-repeat left;
+       background: transparent url(<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/elgg_sprites.png) no-repeat left;
        width: 16px;
        height: 16px;
        margin: 0 2px;
@@ -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;
@@ -290,6 +296,8 @@
        background-position: 0 -1578px;
 }
 
+
+
 .elgg-avatar > .elgg-icon-hover-menu {
        display: none;
        position: absolute;

diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index eb934e16c574121df84b837b9580415c59eeee18..570f4f8b90d000f1cfe77a028805cfc51edbf5a2 100644 (file)
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -76,7 +76,7 @@ body {
 }
 .elgg-page-header > .elgg-inner {
        position: relative;
-       background: transparent url(<?php echo elgg_get_site_url(); ?>mod/cic_theme/_graphics/cic_small.png) no-repeat 650px bottom;
+       background: transparent url(<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/n1_small.png) no-repeat 650px bottom;
 }
 
 /***** LIQUID LAYOUT *******/

diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index b05aa5ce8831d1b156bc43c93e000894b2fc4bba..28332bb7d43c720c4ca3c7c8af0594d417339665 100644 (file)
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -59,7 +59,7 @@
        margin-bottom: 5px;
 }
 .elgg-module-popup > .elgg-head * {
-       color: #56A00E;
+       color: #d86c2c;
 }
 
 /* Dropdown */
@@ -89,15 +89,15 @@
 
 /* Featured */
 .elgg-module-featured {
-       border: 1px solid #56A00E;
+       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: #56A00E;
+       background-color: #333;
 }
 .elgg-module-featured > .elgg-head * {
        color: white;

diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index f07d95143a84d17879a431da9079c5b1e347e7b6..1b08c53058c3e6dd107a8f3cb720056a1cf8e938 100644 (file)
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -230,7 +230,7 @@
 }
 
 .elgg-menu-site-default > li > a {
-       color: #B3FF42;
+       color: #ed9239;
 }
 
 .elgg-menu-site > li > ul {
@@ -267,7 +267,7 @@
 
 .elgg-menu-site-more > li > a {
        background-color: #333;
-       color: #B3FF42;
+       color: #ed9239;
 
        -webkit-border-radius: 0;
        -moz-border-radius: 0;

diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index 1f0f18c47bc2fcc099fb50d6fd75ac956aae9761..f6b8549571f9dad0de9f866163b24c3f04b4b0cf 100644 (file)
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -40,7 +40,7 @@ body {
 }
 
 a {
-       color: #56A00E;
+       color: #ff4c12;
 }
 
 a:hover,
@@ -156,7 +156,7 @@ h6 { font-size: 0.8em; }
 }
 
 .elgg-loud {
-       color: #56A00E;
+       color: #d86c2c;
 }
 
 /* ***************************************