diff options
51 files changed, 1520 insertions, 732 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b25c15b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/_graphics/ajax-loader.gif b/_graphics/ajax-loader.gif Binary files differnew file mode 100644 index 0000000..4d7fd4e --- /dev/null +++ b/_graphics/ajax-loader.gif diff --git a/_graphics/elgg_sprites.png b/_graphics/elgg_sprites.png Binary files differnew file mode 100644 index 0000000..b51b7ef --- /dev/null +++ b/_graphics/elgg_sprites.png diff --git a/_graphics/icons/pad_lrg.gif b/_graphics/icons/pad_lrg.gif Binary files differnew file mode 100644 index 0000000..213d9b0 --- /dev/null +++ b/_graphics/icons/pad_lrg.gif diff --git a/_graphics/icons/pad_small.gif b/_graphics/icons/pad_small.gif Binary files differnew file mode 100644 index 0000000..594a51b --- /dev/null +++ b/_graphics/icons/pad_small.gif diff --git a/_graphics/icons/pad_tiny.gif b/_graphics/icons/pad_tiny.gif Binary files differnew file mode 100644 index 0000000..29efe67 --- /dev/null +++ b/_graphics/icons/pad_tiny.gif diff --git a/_graphics/icons/pages_lrg.gif b/_graphics/icons/pages_lrg.gif Binary files differnew file mode 100644 index 0000000..838bdfd --- /dev/null +++ b/_graphics/icons/pages_lrg.gif diff --git a/_graphics/icons/pages_small.gif b/_graphics/icons/pages_small.gif Binary files differnew file mode 100644 index 0000000..58facea --- /dev/null +++ b/_graphics/icons/pages_small.gif diff --git a/_graphics/icons/pages_tiny.gif b/_graphics/icons/pages_tiny.gif Binary files differnew file mode 100644 index 0000000..216ef38 --- /dev/null +++ b/_graphics/icons/pages_tiny.gif diff --git a/_graphics/n1.png b/_graphics/n1.png Binary files differnew file mode 100644 index 0000000..5007358 --- /dev/null +++ b/_graphics/n1.png diff --git a/_graphics/n1_small.png b/_graphics/n1_small.png Binary files differnew file mode 100644 index 0000000..ad645df --- /dev/null +++ b/_graphics/n1_small.png diff --git a/_graphics/privacy.png b/_graphics/privacy.png Binary files differnew file mode 100644 index 0000000..4866921 --- /dev/null +++ b/_graphics/privacy.png diff --git a/_graphics/sidebar_background.gif b/_graphics/sidebar_background.gif Binary files differnew file mode 100644 index 0000000..3534b5d --- /dev/null +++ b/_graphics/sidebar_background.gif diff --git a/_graphics/two_sidebar_background.gif b/_graphics/two_sidebar_background.gif Binary files differnew file mode 100644 index 0000000..d70fec2 --- /dev/null +++ b/_graphics/two_sidebar_background.gif diff --git a/index.php b/index.php new file mode 100644 index 0000000..0716540 --- /dev/null +++ b/index.php @@ -0,0 +1,26 @@ +<?php +/** + * Elgg index page for web-based applications + * + * @package Elgg + * @subpackage Core + */ + +if (elgg_is_logged_in()) { + forward('activity'); +} + +elgg_load_css('n1:landing_page'); + +$content = elgg_view('n1_theme/landing'); +$content .= elgg_view_title(elgg_echo('content:latest')); +$content .= elgg_list_river(); + +$login_box = elgg_view('core/account/login_box'); + +$params = array( + 'content' => $content, + 'sidebar' => $login_box +); +$body = elgg_view_layout('one_sidebar', $params); +echo elgg_view_page(null, $body); diff --git a/languages/ca.php b/languages/ca.php new file mode 100644 index 0000000..d175b2c --- /dev/null +++ b/languages/ca.php @@ -0,0 +1,10 @@ +<?php + +$catalan = array( + + '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"', + +); + +add_translation("ca", $catalan); diff --git a/languages/en.php b/languages/en.php new file mode 100644 index 0000000..ad5de2f --- /dev/null +++ b/languages/en.php @@ -0,0 +1,10 @@ +<?php + +$english = array( + + '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"', + +); + +add_translation("en", $english); diff --git a/languages/es.php b/languages/es.php new file mode 100644 index 0000000..fd23fb6 --- /dev/null +++ b/languages/es.php @@ -0,0 +1,10 @@ +<?php + +$spanish = array( + + '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"', + +); + +add_translation("es", $spanish); @@ -3,30 +3,60 @@ elgg_register_event_handler('init', 'system', 'n1_theme_init');
function n1_theme_init() {
- // Override Elgg logo item
- elgg_register_menu_item('topbar', array(
- 'name' => 'elgg_logo',
- 'text' => elgg_get_site_entity()->name,
- 'href' => elgg_get_site_url(),
- 'priority' => 0,
- ));
+ elgg_unregister_menu_item('topbar','elgg_logo');
+ $item = new ElggMenuItem('site_logo', elgg_get_site_entity()->name, elgg_get_site_url());
+ elgg_register_menu_item('topbar', $item);
+ elgg_register_plugin_hook_handler('register', 'menu:topbar', 'n1_theme_topbar_menu');
- if(elgg_is_menu_item_registered('site', 'groups')){
- elgg_unregister_menu_item('site', 'groups');
- elgg_register_menu_item('topbar', array(
- 'name' => 'groups',
- 'text' => elgg_view_icon('groups') . elgg_view('n1_theme/topbar/groups'),
- 'title' => elgg_echo('groups'),
- 'href' => 'groups/all',
- 'priority' => 500,
- ));
- }
+ elgg_register_plugin_hook_handler('index', 'system', 'n1_theme_front_page');
- elgg_register_plugin_hook_handler('register', 'menu:topbar', 'n1_theme_topbar_menu');
+ elgg_register_simplecache_view('n1_theme/landing');
+ elgg_register_css('n1:landing_page', elgg_get_simplecache_url('css', 'n1_theme/landing'));
+ elgg_extend_view('css/elgg', 'n1_theme/css');
elgg_extend_view('js/elgg', 'n1_theme/js');
+
+ if (elgg_is_active_plugin('pages')) {
+ // pages icon url override
+ elgg_register_plugin_hook_handler('entity:icon:url', 'object', 'n1_theme_pages_icon_url_override');
+ }
}
function n1_theme_topbar_menu($hook, $type, $returnvalue, $params){
//var_dump($returnvalue);exit();
}
+
+function n1_theme_front_page($hook, $type, $returnvalue, $params) {
+ include(elgg_get_plugins_path() . 'n1_theme/index.php');
+ return true;
+}
+
+/**
+ * Override the default entity icon for pages and pads
+ *
+ * @return string Relative URL
+ */
+function n1_theme_pages_icon_url_override($hook, $type, $returnvalue, $params) {
+ $entity = $params['entity'];
+ if (elgg_instanceof($entity, 'object', 'page_top') ||
+ elgg_instanceof($entity, 'object', 'page')) {
+ $icon = 'pages';
+ } elseif (elgg_instanceof($entity, 'object', 'etherpad') ||
+ elgg_instanceof($entity, 'object', 'subpad')) {
+ $icon = 'pad';
+ } else {
+ return $returnvalue;
+ }
+ switch ($params['size']) {
+ case 'topbar':
+ case 'tiny':
+ return "mod/n1_theme/_graphics/icons/{$icon}_tiny.gif";
+ break;
+ case 'small':
+ return "mod/n1_theme/_graphics/icons/{$icon}_small.gif";
+ break;
+ default:
+ return "mod/n1_theme/_graphics/icons/{$icon}_lrg.gif";
+ break;
+ }
+}
diff --git a/vendors/opensans/LICENSE.txt b/vendors/opensans/LICENSE.txt new file mode 100644 index 0000000..75b5248 --- /dev/null +++ b/vendors/opensans/LICENSE.txt @@ -0,0 +1,202 @@ +
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/vendors/opensans/OpenSans-Bold.ttf b/vendors/opensans/OpenSans-Bold.ttf Binary files differnew file mode 100644 index 0000000..fd79d43 --- /dev/null +++ b/vendors/opensans/OpenSans-Bold.ttf diff --git a/vendors/opensans/OpenSans-BoldItalic.ttf b/vendors/opensans/OpenSans-BoldItalic.ttf Binary files differnew file mode 100644 index 0000000..9bc8009 --- /dev/null +++ b/vendors/opensans/OpenSans-BoldItalic.ttf diff --git a/vendors/opensans/OpenSans-ExtraBold.ttf b/vendors/opensans/OpenSans-ExtraBold.ttf Binary files differnew file mode 100644 index 0000000..21f6f84 --- /dev/null +++ b/vendors/opensans/OpenSans-ExtraBold.ttf diff --git a/vendors/opensans/OpenSans-ExtraBoldItalic.ttf b/vendors/opensans/OpenSans-ExtraBoldItalic.ttf Binary files differnew file mode 100644 index 0000000..31cb688 --- /dev/null +++ b/vendors/opensans/OpenSans-ExtraBoldItalic.ttf diff --git a/vendors/opensans/OpenSans-Italic.ttf b/vendors/opensans/OpenSans-Italic.ttf Binary files differnew file mode 100644 index 0000000..c90da48 --- /dev/null +++ b/vendors/opensans/OpenSans-Italic.ttf diff --git a/vendors/opensans/OpenSans-Light.ttf b/vendors/opensans/OpenSans-Light.ttf Binary files differnew file mode 100644 index 0000000..0d38189 --- /dev/null +++ b/vendors/opensans/OpenSans-Light.ttf diff --git a/vendors/opensans/OpenSans-LightItalic.ttf b/vendors/opensans/OpenSans-LightItalic.ttf Binary files differnew file mode 100644 index 0000000..68299c4 --- /dev/null +++ b/vendors/opensans/OpenSans-LightItalic.ttf diff --git a/vendors/opensans/OpenSans-Regular.ttf b/vendors/opensans/OpenSans-Regular.ttf Binary files differnew file mode 100644 index 0000000..db43334 --- /dev/null +++ b/vendors/opensans/OpenSans-Regular.ttf diff --git a/vendors/opensans/OpenSans-Semibold.ttf b/vendors/opensans/OpenSans-Semibold.ttf Binary files differnew file mode 100644 index 0000000..1a7679e --- /dev/null +++ b/vendors/opensans/OpenSans-Semibold.ttf diff --git a/vendors/opensans/OpenSans-SemiboldItalic.ttf b/vendors/opensans/OpenSans-SemiboldItalic.ttf Binary files differnew file mode 100644 index 0000000..59b6d16 --- /dev/null +++ b/vendors/opensans/OpenSans-SemiboldItalic.ttf diff --git a/views/default/css/admin.php b/views/default/css/admin.php index c02d435..b996e56 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -25,7 +25,6 @@ table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; - outline: 0; font-weight: inherit; font-style: inherit; font-size: 100%; @@ -41,9 +40,6 @@ img { border-width: 0; border-color: transparent; } -:focus { - outline: 0 none; -} ol, ul { list-style: none; } @@ -106,7 +102,14 @@ a:hover { text-decoration: underline; } pre, code { - background: #EBF5FF; + background-color: #EEE; + border: 1px solid #DDD; + color: #444; + font-family: Monaco, "Courier New", Courier, monospace; + font-size: 13px; + overflow: auto; + margin: 15px 0; + padding: 5px; } blockquote { background: #EBF5FF; @@ -120,14 +123,23 @@ p { } /* Clearfix! */ +.clearfix:after, .elgg-grid:after, -.clearfix:after { +.elgg-layout:after, +.elgg-inner:after, +.elgg-page-header:after, +.elgg-page-footer:after, +.elgg-head:after, +.elgg-foot:after, +.elgg-col:after, +.elgg-image-block:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } + .elgg-body { width: auto; word-wrap: break-word; @@ -138,6 +150,7 @@ p { visibility: hidden; height: 0 !important; line-height: 0; + overflow: hidden; font-size: xx-large; content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x "; } @@ -279,14 +292,6 @@ p { .elgg-main h2 { color: #333333; } -<?php // elgg-layout gets clearfix ?> -.elgg-layout:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} /* *************************************** FOOTER @@ -350,6 +355,8 @@ p { .elgg-table td, .elgg-table th { background: white; border: 1px solid #ccc; + padding: 4px 8px; + vertical-align: middle; } .elgg-table th { background-color: #ddd; @@ -357,10 +364,10 @@ p { .elgg-table .alt td { background: #eee; } -.elgg-table td { - padding: 4px 8px; - border-bottom: 1px solid #ccc; +.elgg-table input[type=checkbox] { + margin-top: 3px; } + .elgg-table-alt { width: 100%; border-top: 1px solid #ccc; @@ -432,7 +439,9 @@ input { -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; + margin: 0; } + /* default elgg core input field classes */ .elgg-input-text, .elgg-input-tags, @@ -462,7 +471,6 @@ textarea { width: auto; padding: 2px 4px; cursor: pointer; - outline: none; } a.elgg-button { padding: 3px 6px; @@ -529,20 +537,20 @@ a.elgg-button { -webkit-border-radius: 5px; } .ui-datepicker-prev, .ui-datepicker-next { - position: absolute; - top: 9px; + position: absolute; + top: 9px; cursor: pointer; } .ui-datepicker-prev { - left: 6px; + left: 6px; } .ui-datepicker-next { - right: 6px; + right: 6px; } .ui-datepicker-title { - line-height: 1.8em; - margin: 0 30px; - text-align: center; + line-height: 1.8em; + margin: 0 30px; + text-align: center; font-weight: bold; } .ui-datepicker-calendar { @@ -550,39 +558,237 @@ a.elgg-button { } .ui-datepicker th { border: none; - font-weight: bold; - padding: 5px 6px; - text-align: center; + font-weight: bold; + padding: 5px 6px; + text-align: center; } .ui-datepicker td { padding: 1px; } .ui-datepicker td span, .ui-datepicker td a { - display: block; - padding: 2px; + display: block; + padding: 2px; line-height: 1.2em; - text-align: right; - text-decoration: none; + text-align: right; + text-decoration: none; } .ui-datepicker-calendar .ui-state-default { border: 1px solid #ccc; - color: #555; + color: #555; background: #fafafa; } .ui-datepicker-calendar .ui-state-hover { border: 1px solid #aaa; - color: #333; + color: #333; background: #ccc; } .ui-datepicker-calendar .ui-state-active, .ui-datepicker-calendar .ui-state-active.ui-state-hover { font-weight: bold; - border: 1px solid #999; - color: #333; + border: 1px solid #999; + color: #333; background: #ddd; } /* *************************************** + AUTOCOMPLETE +*************************************** */ +<?php //autocomplete will expand to fullscreen without max-width ?> +.ui-autocomplete { + position: absolute; + cursor: default; +} +.elgg-autocomplete-item .elgg-body { + max-width: 600px; +} +.ui-autocomplete { + background-color: white; + 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; +} +.ui-autocomplete .ui-menu-item:hover { + background-color: #eee; +} +.ui-autocomplete a:hover { + text-decoration: none; + color: #4690D6; +} + +/* *************************************** + USER PICKER +*************************************** */ +.elgg-user-picker-list li:first-child { + border-top: 1px dotted #ccc; + margin-top: 5px; +} +.elgg-user-picker-list > li { + border-bottom: 1px dotted #ccc; +} + +/* *************************************** + FRIENDS PICKER +*************************************** */ +.friends-picker-main-wrapper { + margin-bottom: 15px; +} +.friends-picker-container h3 { + font-size:4em !important; + text-align: left; + margin:10px 0 20px !important; + color:#999 !important; + background: none !important; + padding:0 !important; +} +.friends-picker .friends-picker-container .panel ul { + text-align: left; + margin: 0; + padding:0; +} +.friends-picker-wrapper { + margin: 0; + padding:0; + position: relative; + width: 730px; +} +.friends-picker { + position: relative; + overflow: hidden; + margin: 0; + padding:0; + width: 730px; + height: auto; + background-color: #dedede; + + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; +} +.friendspicker-savebuttons { + background: white; + + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + + margin:0 10px 10px; +} +.friends-picker .friends-picker-container { /* long container used to house end-to-end panels. Width is calculated in JS */ + position: relative; + left: 0; + top: 0; + width: 100%; + list-style-type: none; +} +.friends-picker .friends-picker-container .panel { + float:left; + height: 100%; + position: relative; + width: 730px; + margin: 0; + padding:0; +} +.friends-picker .friends-picker-container .panel .wrapper { + margin: 0; + padding:4px 10px 10px 10px; + min-height: 230px; +} +.friends-picker-navigation { + margin: 0 0 10px; + padding:0 0 10px; + border-bottom:1px solid #ccc; +} +.friends-picker-navigation ul { + list-style: none; + padding-left: 0; +} +.friends-picker-navigation ul li { + float: left; + margin:0; + background:white; +} +.friends-picker-navigation a { + font-weight: bold; + text-align: center; + background: white; + color: #999; + text-decoration: none; + display: block; + padding: 0; + width:20px; + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.tabHasContent { + background: white; + color:#333 !important; +} +.friends-picker-navigation li a:hover { + background: #333; + color:white !important; +} +.friends-picker-navigation li a.current { + background: #4690D6; + color:white !important; +} +.friends-picker-navigation-l, .friends-picker-navigation-r { + position: absolute; + top: 46px; + text-indent: -9000em; +} +.friends-picker-navigation-l a, .friends-picker-navigation-r a { + display: block; + height: 40px; + width: 40px; +} +.friends-picker-navigation-l { + right: 48px; + z-index:1; +} +.friends-picker-navigation-r { + right: 0; + z-index:1; +} +.friends-picker-navigation-l { + background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left top; +} +.friends-picker-navigation-r { + background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px top; +} +.friends-picker-navigation-l:hover { + background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left -44px; +} +.friends-picker-navigation-r:hover { + background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px -44px; +} +.friendspicker-savebuttons .elgg-button-submit, +.friendspicker-savebuttons .elgg-button-cancel { + margin:5px 20px 5px 5px; +} +.friendspicker-members-table { + background: #dedede; + + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + + margin:10px 0 0; + padding:10px 10px 0; +} + +/* *************************************** PAGINATION *************************************** */ .elgg-pagination { @@ -816,6 +1022,27 @@ a.elgg-button { } /* *************************************** + WIDGET MENU +*************************************** */ +.elgg-menu-widget > li { + position: absolute; + top: 4px; + display: inline-block; + width: 18px; + height: 18px; + padding: 2px 2px 0 0; +} +.elgg-menu-widget > .elgg-menu-item-collapse { + left: 5px; +} +.elgg-menu-widget > .elgg-menu-item-delete { + right: 5px; +} +.elgg-menu-widget > .elgg-menu-item-settings { + right: 25px; +} + +/* *************************************** MORE MENUS *************************************** */ /* Horizontal menus w/ separator support */ @@ -914,22 +1141,16 @@ a.elgg-button { height: 26px; overflow: hidden; } +.elgg-module-widget.elgg-state-draggable .elgg-widget-handle { + cursor: move; +} .elgg-module-widget > .elgg-head h3 { float: left; padding: 4px 45px 0 20px; color: #333; } -.elgg-module-widget > .elgg-head a { - position: absolute; - top: 4px; - display: inline-block; - width: 18px; - height: 18px; - padding: 2px 2px 0 0; -} .elgg-widget-collapse-button { - left: 5px; color: #c5c5c5; text-decoration: none; } @@ -944,12 +1165,6 @@ a.elgg-widget-collapse-button:before { a.elgg-widget-collapsed:before { content: "\25BA"; } -.elgg-widget-delete-button { - right: 5px; -} -.elgg-widget-edit-button { - right: 25px; -} .elgg-module-widget > .elgg-body { border-top: 1px solid #dedede; background-color: white; @@ -1245,6 +1460,14 @@ a.elgg-widget-collapsed:before { padding: 5px 10px; margin: 4px 0; } +ul.elgg-plugin-categories, ul.elgg-plugin-categories > li, +ul.elgg-plugin-resources, ul.elgg-plugin-resources > li { + display: inline; +} +.elgg-plugin-category-bundled { + border-width: 2px; + border-color: #0054A7; +} /**************************************** MARKDOWN @@ -1288,6 +1511,12 @@ a.elgg-widget-collapsed:before { margin-bottom: 5px; } +.elgg-text-help { + display: block; + font-size: 85%; + font-style: italic; +} + .elgg-longtext-control { margin-left: 14px; font-size: 80%; diff --git a/views/default/css/elements/buttons.php b/views/default/css/elements/buttons.php index e9c99cf..2d53ed1 100644 --- a/views/default/css/elements/buttons.php +++ b/views/default/css/elements/buttons.php @@ -12,114 +12,197 @@ /* Base */ .elgg-button { - font-size: 14px; + font-size: 13px; font-weight: bold; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - width: auto; - padding: 2px 4px; + padding: 4px 15px; cursor: pointer; + border: 1px solid #bbb; outline: none; + color: #666; + text-decoration: none; - -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); - -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); - box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); + box-shadow: 0px 1px 1px #888; + + + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + + + background: #eeeeee; /* Old browsers */ + background: -moz-linear-gradient(top, #eeeeee 0%, #cccccc 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eeeeee), color-stop(100%,#cccccc)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* IE10+ */ + background: linear-gradient(to bottom, #eeeeee 0%,#cccccc 100%); /* W3C */ +} + +.elgg-button:hover { + background: #dbdbdb; /* Old browsers */ + background: -moz-linear-gradient(top, #dbdbdb 0%, #b7b7b7 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dbdbdb), color-stop(100%,#b7b7b7)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #dbdbdb 0%,#b7b7b7 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #dbdbdb 0%,#b7b7b7 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #dbdbdb 0%,#b7b7b7 100%); /* IE10+ */ + background: linear-gradient(to bottom, #dbdbdb 0%,#b7b7b7 100%); /* W3C */ } + + a.elgg-button { - padding: 3px 6px; + text-decoration: none; } /* Submit: This button should convey, "you're about to take some definitive action" */ .elgg-button-submit { - color: white; - text-shadow: 1px 1px 0px black; - text-decoration: none; - border: 1px solid #4690d6; - background: #4690d6 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px; + color: #ddd; + text-shadow: 0 -1px 0px #000; + box-shadow: 0px 1px 2px #333; + border: none; + + background: #444444; /* Old browsers */ + background: -moz-linear-gradient(top, #444444 0%, #000000 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#444444), color-stop(100%,#000000)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #444444 0%,#000000 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #444444 0%,#000000 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #444444 0%,#000000 100%); /* IE10+ */ + background: linear-gradient(to bottom, #444444 0%,#000000 100%); /* W3C */ + } .elgg-button-submit:hover { - border-color: #0054a7; - text-decoration: none; - color: white; - background: #0054a7 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px; + color: #eee; + text-shadow: 0 1px 1px #222; + + background: #6b6b6b; /* Old browsers */ + background: -moz-linear-gradient(top, #6b6b6b 1%, #0f0f0f 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(1%,#6b6b6b), color-stop(100%,#0f0f0f)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #6b6b6b 1%,#0f0f0f 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #6b6b6b 1%,#0f0f0f 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #6b6b6b 1%,#0f0f0f 100%); /* IE10+ */ + background: linear-gradient(to bottom, #6b6b6b 1%,#0f0f0f 100%); /* W3C */ + } .elgg-button-submit.elgg-state-disabled { - background: #999; - border-color: #999; + background: #45484d; + color: #888; cursor: default; } + /* Cancel: This button should convey a negative but easily reversible action (e.g., turning off a plugin) */ .elgg-button-cancel { - color: #333; - background: #ddd url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px; - border: 1px solid #999; + color: #888; + + + } .elgg-button-cancel:hover { - color: #444; - background-color: #999; - background-position: left 10px; - text-decoration: none; + color: #BA1C1C; + } /* Action: This button should convey a normal, inconsequential action, such as clicking a link */ .elgg-button-action { - background: #ccc url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif) repeat-x 0 0; - border:1px solid #999; - color: #333; - padding: 2px 15px; - text-align: center; - font-weight: bold; - text-decoration: none; - text-shadow: 0 1px 0 white; - cursor: pointer; + color: #ddd; + text-shadow: 0 -1px 0px #000; + border: none; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + background: #444444; /* Old browsers */ + background: -moz-linear-gradient(top, #444444 0%, #000000 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#444444), color-stop(100%,#000000)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #444444 0%,#000000 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #444444 0%,#000000 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #444444 0%,#000000 100%); /* IE10+ */ + background: linear-gradient(to bottom, #444444 0%,#000000 100%); /* W3C */ } + .elgg-button-action:hover, .elgg-button-action:focus { - background: #ccc url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif) repeat-x 0 -15px; - color: #111; - text-decoration: none; - border: 1px solid #999; + color: #eee; + + background: #6b6b6b; /* Old browsers */ + background: -moz-linear-gradient(top, #6b6b6b 1%, #0f0f0f 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(1%,#6b6b6b), color-stop(100%,#0f0f0f)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #6b6b6b 1%,#0f0f0f 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #6b6b6b 1%,#0f0f0f 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #6b6b6b 1%,#0f0f0f 100%); /* IE10+ */ + background: linear-gradient(to bottom, #6b6b6b 1%,#0f0f0f 100%); /* W3C */ + + +} + + +.elgg-button-action.elgg-state-disabled { + background: #45484d; + color: #888; + cursor: default; } /* Delete: This button should convey "be careful before you click me" */ .elgg-button-delete { - color: #bbb; - text-decoration: none; - border: 1px solid #333; - background: #555 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px; - text-shadow: 1px 1px 0px black; + color: #d36900; + text-shadow: 0 -1px 0px #111; + border: none; + + background: #45484d; /* Old browsers */ + background: -moz-linear-gradient(top, #45484d 0%, #000000 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#45484d), color-stop(100%,#000000)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #45484d 0%,#000000 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #45484d 0%,#000000 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #45484d 0%,#000000 100%); /* IE10+ */ + background: linear-gradient(to bottom, #45484d 0%,#000000 100%); /* W3C */ } + + + + + .elgg-button-delete:hover { - color: #999; - background-color: #333; - background-position: left 10px; + color: #d36900; + + bbackground: #6b6b6b; /* Old browsers */ + background: -moz-linear-gradient(top, #6b6b6b 1%, #0f0f0f 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(1%,#6b6b6b), color-stop(100%,#0f0f0f)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #6b6b6b 1%,#0f0f0f 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #6b6b6b 1%,#0f0f0f 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #6b6b6b 1%,#0f0f0f 100%); /* IE10+ */ + background: linear-gradient(to bottom, #6b6b6b 1%,#0f0f0f 100%); /* W3C */ text-decoration: none; } +.elgg-button-delete .elgg-state-disabled { + color: #d36900; + background-color: #333; + text-shadow: 0 -1px 0px #111; + border: 1px solid #999; +} + +.elgg-button-delete .elgg-state-disabled:hover { + color: #d36900; + background-color: #333; + text-shadow: 0 -1px 0px #111; + border: 1px solid #999; +} + + + + .elgg-button-dropdown { padding:3px 6px; text-decoration:none; display:block; - font-weight:bold; + font-weight:normal; position:relative; margin-left:0; - color: white; - border:1px solid #71B9F7; + color: #333; + border:1px solid #333; -webkit-border-radius:4px; -moz-border-radius:4px; @@ -140,7 +223,8 @@ a.elgg-button { } .elgg-button-dropdown:hover { - background-color:#71B9F7; + color: #333; + background-color: #d86c2c; text-decoration:none; } diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php index f675ab7..daac3c7 100644 --- a/views/default/css/elements/components.php +++ b/views/default/css/elements/components.php @@ -7,17 +7,6 @@ * @package Elgg.Core * @subpackage UI */ -/** - * elgg-body fills the space available to it. - * It uses hidden text to expand itself. The combination of auto width, overflow - * hidden, and the hidden text creates this effect. - * - * This allows us to float fixed width divs to either side of an .elgg-body div - * without having to specify the body div's width. - * - * @todo check what happens with long <pre> tags or large images - * @todo Move this to its own file -- it is very complicated and should not have to be overridden. - */ ?> /* *************************************** @@ -35,6 +24,10 @@ margin-left: 5px; } +.elgg-subtext { +margin-top: 3px; +} + /* *************************************** List *************************************** */ @@ -50,10 +43,20 @@ .elgg-item .elgg-subtext { margin-bottom: 5px; } -.elgg-item .elgg-content { - margin: 10px 5px; + +.elgg-item .elgg-content, .elgg-content .elgg-output, .elgg-item .elgg-output { + margin: 5px; + background-color: #f7f7f7; + border: 1px solid #ddd; + padding: 10px; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } + + /* *************************************** Gallery *************************************** */ @@ -96,7 +99,11 @@ width: 100%; border-top: 1px solid #ccc; } -.elgg-table-alt td { +.elgg-table-alt th { + background-color: #eee; + font-weight: bold; +} +.elgg-table-alt td, .elgg-table-alt th { padding: 2px 4px 2px 4px; border-bottom: 1px solid #ccc; } @@ -114,6 +121,16 @@ margin-bottom: 20px; } +.elgg-owner-block h3 { + +} +.elgg-owner-block .elgg-subtext { + padding: 2px 0 9px 0; +} + + + + /* *************************************** Messages *************************************** */ @@ -129,18 +146,19 @@ -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; + -webkit-border-radius: 3px; + -moz-border-radius: 3x; + border-radius: 3px; } .elgg-state-success { - background-color: black; + background-color: #219C8B; + color: white; } .elgg-state-error { - background-color: red; + background-color: #DE0218; } .elgg-state-notice { - background-color: #4690D6; + background-color: #ff4c12; } /* *************************************** @@ -161,18 +179,30 @@ .elgg-river-timestamp { color: #666; font-size: 85%; - font-style: italic; line-height: 1.2em; } +.elgg-river-timestamp:before { + content: '('; +} +.elgg-river-timestamp:after { + content: ')'; +} .elgg-river-attachments, .elgg-river-message, .elgg-river-content { - border-left: 1px solid #CCC; - font-size: 85%; + color: #444; + background-color: #f7f7f7; + border: 1px solid #ccc; + border-radius: 3px; + font-size: 100%; line-height: 1.5em; margin: 8px 0 5px 0; - padding-left: 5px; + padding: 5px; +} + +.elgg-river-summary{ + font-size: 94%; } .elgg-river-attachments .elgg-avatar, .elgg-river-attachments .elgg-icon { @@ -185,13 +215,14 @@ .elgg-river-comments-tab { display: block; - background-color: #EEE; - color: #4690D6; + background-color: #f7f7f7; + color: #444; margin-top: 5px; width: auto; float: right; font-size: 85%; padding: 1px 7px; + border-right: solid 1px #BBB; -webkit-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; @@ -201,8 +232,24 @@ <?php //@todo components.php ?> .elgg-river-comments { margin: 0; + background-color: #f7f7f7; border-top: none; + border-right: solid 1px #BBB; + border-bottom: solid 1px #BBB; + + -webkit-border-radius: 3px; + -webkit-border-top-right-radius: 0; + -moz-border-radius: 3px; + -moz-border-radius-topright: 0; + border-radius: 3px; + border-top-right-radius: 0; } + +.elgg-river-comments .elgg-output { + border: none; + +} + .elgg-river-comments li:first-child { -webkit-border-radius: 5px 0 0; -moz-border-radius: 5px 0 0; @@ -214,7 +261,6 @@ border-radius-bottomleft: 0 0 5px 5px; } .elgg-river-comments li { - background-color: #EEE; border-bottom: none; padding: 4px; margin-bottom: 2px; @@ -263,30 +309,39 @@ margin-top: 15px; } +.elgg-comments h3{ + font-weight: bold; + margin-bottom: 5px; +} + +.elgg-comments li.elgg-item { + padding: 10px 0; +} + /* *************************************** Image-related *************************************** */ .elgg-photo { - border: 1px solid #ccc; - padding: 3px; + border: 1px solid #CCC; + padding: 1px; background-color: white; + box-shadow: 0px 1px 1px #666; } /* *************************************** Tags *************************************** */ .elgg-tags { - display: inline; font-size: 85%; } -.elgg-tags li { - display: inline; +.elgg-tags > li { + float:left; margin-right: 5px; } -.elgg-tags li:after { +.elgg-tags li.elgg-tag:after { content: ","; } -.elgg-tags li:last-child:after { +.elgg-tags li.elgg-tag:last-child:after { content: ""; } .elgg-tagcloud { diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php index ace6048..74f21ee 100644 --- a/views/default/css/elements/core.php +++ b/views/default/css/elements/core.php @@ -46,13 +46,28 @@ *overflow:visible; } -<?php //@todo isn't this only needed if we use display:table-cell? ?> +<?php +/** + * elgg-body fills the space available to it. + * It uses hidden text to expand itself. The combination of auto width, overflow + * hidden, and the hidden text creates this effect. + * + * This allows us to float fixed width divs to either side of an .elgg-body div + * without having to specify the body div's width. + * + * @todo check what happens with long <pre> tags or large images + * @todo Move this to its own file -- it is very complicated and should not have to be overridden. + */ + +//@todo isn't this only needed if we use display:table-cell? +?> .elgg-body:after, .elgg-col-last:after { display: block; visibility: hidden; height: 0 !important; line-height: 0; + overflow: hidden; /* Stretch to fill up available space */ font-size: xx-large; diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index e358c86..c2cc433 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -10,8 +10,34 @@ /* *************************************** Form Elements *************************************** */ +fieldset.elgg-fieldset { + border: 1px solid #ccc; + padding: 10px; + margin-top: 10px; + background-color: #dedede; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + +fieldset.elgg-fieldset legend { + font-weight: bold; + font-size: 110%; + padding: 3px 8px; + background-color: #EEE; + border: 1px solid #BBB; + + box-shadow: 1px 1px 2px #bbb; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + fieldset > div { margin-bottom: 15px; + } fieldset > div:last-child { margin-bottom: 0; @@ -22,31 +48,49 @@ fieldset > div:last-child { } label { - font-weight: bold; color: #333; - font-size: 110%; } input, textarea { - border: 1px solid #ccc; color: #666; - font: 120% Arial, Helvetica, sans-serif; + font-family: "Open Sans"; + font-size: 120%; padding: 5px; width: 100%; +} + +input[type=text], input[type=password], textarea { + background-color: #f7f7f7; + border: 1px solid #ccc; + -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; + -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; + + box-shadow: inset 0 2px 3px #999; } -input:focus, textarea:focus { - border: solid 1px #4690d6; - background: #e4ecf5; +input[type=text]:focus, input[type=password]:focus, textarea:focus { + /*border: solid 1px #ff4c12;*/ + /*background: #D5E2F7;*/ + background: white; + border: 1px solid #888; color:#333; } +input[type=file], input[type=button], input[type=reset], input[type=submit] { + border: none; +} + +input[type=file] { + background: none; +} + + textarea { height: 200px; } @@ -104,7 +148,7 @@ input[type="radio"] { margin: 0; padding:0; position: relative; - width: 100%; + width: 730px; } .friends-picker { position: relative; @@ -185,7 +229,7 @@ input[type="radio"] { color:white !important; } .friends-picker-navigation li a.current { - background: #4690D6; + background: #ff4c12; color:white !important; } .friends-picker-navigation-l, .friends-picker-navigation-r { @@ -238,6 +282,8 @@ input[type="radio"] { *************************************** */ <?php //autocomplete will expand to fullscreen without max-width ?> .ui-autocomplete { + font-size: 90%; + font-weight: bold; position: absolute; cursor: default; } @@ -245,7 +291,7 @@ input[type="radio"] { max-width: 600px; } .ui-autocomplete { - background-color: white; + background-color: #333 ; border: 1px solid #ccc; overflow: hidden; @@ -260,12 +306,14 @@ input[type="radio"] { -moz-border-radius: 5px; border-radius: 5px; } -.ui-autocomplete .ui-menu-item:hover { - background-color: #eee; -} -.ui-autocomplete a:hover { +.ui-autocomplete .ui-menu-item:hover a { text-decoration: none; - color: #4690D6; + color: white; + text-shadow: 0 0 6px white; +} + +.ui-combobox { + height: 23px !important; } /* *************************************** @@ -287,8 +335,8 @@ input[type="radio"] { margin-top: 3px; width: 208px; - background-color: white; - border: 1px solid #0054A7; + background-color: #eee; + border: 1px solid #333; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -306,65 +354,63 @@ input[type="radio"] { .ui-datepicker-header { position: relative; - background: #4690D6; - color: white; + background: #333; + color: #eee; padding: 2px 0; - border-bottom: 1px solid #0054A7; } .ui-datepicker-header a { color: white; } .ui-datepicker-prev, .ui-datepicker-next { - position: absolute; - top: 5px; + position: absolute; + top: 5px; cursor: pointer; } .ui-datepicker-prev { - left: 6px; + left: 6px; } .ui-datepicker-next { - right: 6px; + right: 6px; } .ui-datepicker-title { - line-height: 1.8em; - margin: 0 30px; - text-align: center; + line-height: 1.8em; + margin: 0 30px; + text-align: center; font-weight: bold; } .ui-datepicker-calendar { margin: 4px; } .ui-datepicker th { - color: #0054A7; + color: #ff4c12; border: none; - font-weight: bold; - padding: 5px 6px; - text-align: center; + font-weight: bold; + padding: 5px 6px; + text-align: center; } .ui-datepicker td { padding: 1px; } .ui-datepicker td span, .ui-datepicker td a { - display: block; - padding: 2px; + display: block; + padding: 2px; line-height: 1.2em; - text-align: right; - text-decoration: none; + text-align: right; + text-decoration: none; } .ui-datepicker-calendar .ui-state-default { - border: 1px solid #ccc; - color: #4690D6;; - background: #fafafa; + border: 1px solid transparent; + color: #ff4c12; + background: none; } .ui-datepicker-calendar .ui-state-hover { border: 1px solid #aaa; - color: #0054A7; background: #eee; } .ui-datepicker-calendar .ui-state-active, .ui-datepicker-calendar .ui-state-active.ui-state-hover { font-weight: bold; - border: 1px solid #0054A7; - color: #0054A7; - background: #E4ECF5; + border: 1px solid transparent; + color: #eee; + background: #333; } diff --git a/views/default/css/elements/grid.php b/views/default/css/elements/grid.php index fdbaf4a..900300f 100644 --- a/views/default/css/elements/grid.php +++ b/views/default/css/elements/grid.php @@ -23,7 +23,7 @@ width: 50%; } .elgg-col-1of3 { - width: 33.33%; + width: 33.3%; } .elgg-col-2of3 { width: 66.66%; diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php index 9cae59e..1642f26 100644 --- a/views/default/css/elements/icons.php +++ b/views/default/css/elements/icons.php @@ -13,7 +13,7 @@ *************************************** */ .elgg-icon { - background: transparent url(<?php echo elgg_get_site_url(); ?>mod/n1_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; @@ -34,7 +34,7 @@ background-position: 0 -72px; } .elgg-icon-calendar { - background-position: 0 -90px; + background-position: 0 -91px; } .elgg-icon-cell-phone { background-position: 0 -108px; @@ -70,7 +70,7 @@ background-position: 0 -288px; } .elgg-icon-download { - background-position: 0 -306px; + background-position: 0 -304px; } .elgg-icon-eye { background-position: 0 -324px; @@ -148,10 +148,10 @@ background-position: 0 -756px; } .elgg-icon-refresh:hover { - background-position: 0 -774px; + background-position: 0 -775px; } .elgg-icon-refresh { - background-position: 0 -792px; + background-position: 0 -791px; } .elgg-icon-round-arrow-left { background-position: 0 -810px; @@ -175,7 +175,7 @@ background-position: 0 -918px; } .elgg-icon-search { - background-position: 0 -936px; + background-position: 0 -934px; } .elgg-icon-settings-alt:hover { background-position: 0 -954px; @@ -229,7 +229,7 @@ background-position: 0 -1242px; } .elgg-icon-tag { - background-position: 0 -1260px; + background-position: 0 -1242px; } .elgg-icon-thumbs-down-alt:hover { background-position: 0 -1278px; @@ -270,11 +270,15 @@ background-position: 0 -1476px; } .elgg-icon-users { - background-position: 0 -1494px; + background-position: 0 -1493px; } .elgg-icon-video { background-position: 0 -1512px; } +.elgg-icon-logout { + background: transparent url(<?php echo elgg_get_site_url(); ?>mod/_graphics/usernavicons.png) no-repeat left; + background-position: 0 0; +} .elgg-avatar > .elgg-icon-hover-menu { @@ -287,9 +291,9 @@ } .elgg-ajax-loader { - background: white url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif) no-repeat center center; - min-height: 33px; - min-width: 33px; + background: transparent url(<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/ajax-loader.gif) no-repeat center center; + min-height: 31px; + min-width: 31px; } /* *************************************** @@ -298,6 +302,9 @@ .elgg-avatar { position: relative; display: inline-block; + + border: 2px solid #F1F1F1; + box-shadow: 0px 1px 3px #666; } .elgg-avatar > a > img { display: block; @@ -325,9 +332,9 @@ height: 40px; /* remove the border-radius if you don't want rounded avatars in supported browsers */ - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; -moz-background-clip: border; background-clip: border; @@ -341,16 +348,35 @@ .elgg-avatar-medium > a > img { width: 100px; height: 100px; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .elgg-avatar-large > a > img { width: 200px; height: 200px; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.elgg-icon-groups { - background-position: 0 -1530px; + +.elgg-owner-block .elgg-image { + height: 25px; + background-color: #eee; + box-shadow: 0px 1px 2px #333; + padding: 1px; } -.elgg-icon-groups:hover { - background-position: 0 -1550px; +.subgroups-icons a img { + width: 25px; + height: 25px; + background-color: #eee; + box-shadow: 0px 1px 2px #333; + padding: 1px; + margin: 0px 3px 3px 0px; } + + diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php index bb8190c..a399857 100644 --- a/views/default/css/elements/layout.php +++ b/views/default/css/elements/layout.php @@ -14,32 +14,35 @@ /* *************************************** PAGE LAYOUT *************************************** */ + +body { + background-color: #eeeeee; +} + /***** DEFAULT LAYOUT ******/ <?php // the width is on the page rather than topbar to handle small viewports ?> .elgg-page-default { min-width: 998px; } .elgg-page-default .elgg-page-header > .elgg-inner { - width: 990px; + width: 980px; margin: 0 auto; height: 90px; } .elgg-page-default .elgg-page-body > .elgg-inner { - width: 94%; + width: 980px; margin: 0 auto; - padding-top: 25px; } .elgg-page-default .elgg-page-footer > .elgg-inner { - width: 94; + width: 940px; margin: 0 auto; - padding: 5px 0; + padding: 5px 20px; border-top: 1px solid #DEDEDE; } /***** TOPBAR ******/ .elgg-page-topbar { - background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left; - border-bottom: 1px solid #000000; + background-color: #333333; position: relative; height: 24px; z-index: 9000; @@ -66,10 +69,11 @@ /***** PAGE HEADER ******/ .elgg-page-header { position: relative; - background: #4690D6 url(<?php echo elgg_get_site_url(); ?>_graphics/header_shadow.png) repeat-x bottom left; + background: #333333; } .elgg-page-header > .elgg-inner { position: relative; + background: transparent url(<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/n1_small.png) no-repeat 650px bottom; } /***** PAGE BODY LAYOUT ******/ @@ -77,16 +81,16 @@ min-height: 360px; } .elgg-layout-one-sidebar { - background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif) repeat-y right top; + background: transparent url(<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/sidebar_background.gif) repeat-y right top; } .elgg-layout-two-sidebar { - background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/two_sidebar_background.gif) repeat-y right top; + background: transparent url(<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/two_sidebar_background.gif) repeat-y right top; } .elgg-sidebar { position: relative; padding: 20px 10px; float: right; - width: 210px; + width: 220px; margin: 0 0 0 10px; } .elgg-sidebar-alt { @@ -100,10 +104,10 @@ position: relative; min-height: 360px; padding: 10px; + padding-left: 20px; } .elgg-main > .elgg-head { padding-bottom: 3px; - border-bottom: 1px solid #CCCCCC; margin-bottom: 10px; } @@ -114,6 +118,9 @@ .elgg-page-footer { color: #999; } +.elgg-page-footer .elgg-inner { + margin: 20px; +} .elgg-page-footer a:hover { color: #666; } diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php index d9622d3..d2f0a8b 100644 --- a/views/default/css/elements/misc.php +++ b/views/default/css/elements/misc.php @@ -37,11 +37,11 @@ color: #666; } #friends_collections_accordian li h2 { - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; - background: none repeat scroll 0 0 #4690D6; + background: none repeat scroll 0 0 #ff4c12; color: white; cursor: pointer; font-size: 1.2em; diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php index 4868833..2f0a3a5 100644 --- a/views/default/css/elements/modules.php +++ b/views/default/css/elements/modules.php @@ -16,7 +16,7 @@ /* Info */ .elgg-module-info > .elgg-head { - background: #e4e4e4; + background: #dedede; padding: 5px; margin-bottom: 10px; @@ -51,7 +51,7 @@ margin-bottom: 5px; } .elgg-module-popup > .elgg-head * { - color: #0054A7; + color: #d86c2c; } /* Dropdown */ @@ -81,7 +81,7 @@ /* Featured */ .elgg-module-featured { - border: 1px solid #4690D6; + border: 1px solid #ff4c12; -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -89,7 +89,7 @@ } .elgg-module-featured > .elgg-head { padding: 5px; - background-color: #4690D6; + background-color: #ff4c12; } .elgg-module-featured > .elgg-head * { color: white; @@ -140,13 +140,14 @@ } .elgg-module-widget { - background-color: #dedede; padding: 2px; margin: 0 5px 15px; position: relative; + border: 1px solid #ccc; + border-radius: 3px; } -.elgg-module-widget:hover { - background-color: #ccc; +.elgg-module-widget:hover > .elgg-head { + background-color: #f5f5f5; } .elgg-module-widget > .elgg-head { background-color: #eeeeee; @@ -158,19 +159,10 @@ padding: 4px 45px 0 20px; color: #666; } -.elgg-module-widget.elgg-state-draggable > .elgg-head { +.elgg-module-widget.elgg-state-draggable .elgg-widget-handle { cursor: move; } -.elgg-module-widget > .elgg-head a { - position: absolute; - top: 4px; - display: inline-block; - width: 18px; - height: 18px; - padding: 2px 2px 0 0; -} a.elgg-widget-collapse-button { - left: 5px; color: #c5c5c5; } a.elgg-widget-collapse-button:hover, @@ -184,14 +176,7 @@ a.elgg-widget-collapse-button:before { a.elgg-widget-collapsed:before { content: "\25BA"; } -a.elgg-widget-delete-button { - right: 5px; -} -a.elgg-widget-edit-button { - right: 25px; -} .elgg-module-widget > .elgg-body { - background-color: white; width: 100%; overflow: hidden; border-top: 2px solid #dedede; diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php index bf1046d..149fb0b 100644 --- a/views/default/css/elements/navigation.php +++ b/views/default/css/elements/navigation.php @@ -14,7 +14,9 @@ margin: 10px 0; display: block; text-align: center; + } + .elgg-pagination li { display: inline; margin: 0 6px 0 0; @@ -26,22 +28,49 @@ border-radius: 4px; padding: 2px 6px; - color: #4690d6; - border: 1px solid #4690d6; + color: #555; + border: 1px solid #ccc; font-size: 12px; + text-shadow: 0px 1px 1px white, 0 -1px 1px #AAA; + + background: #f7f7f7; /* Old browsers */ + background: -moz-linear-gradient(top, #f7f7f7 0%, #d3d3d3 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f7f7f7), color-stop(100%,#d3d3d3)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #f7f7f7 0%,#d3d3d3 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #f7f7f7 0%,#d3d3d3 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #f7f7f7 0%,#d3d3d3 100%); /* IE10+ */ + background: linear-gradient(to bottom, #f7f7f7 0%,#d3d3d3 100%); /* W3C */ } .elgg-pagination a:hover { - background: #4690d6; - color: white; + color: #333; text-decoration: none; + + + background: #ffffff; /* Old browsers */ + background: -moz-linear-gradient(top, #ffffff 0%, #f2f2f2 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f2f2f2)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); /* IE10+ */ + background: linear-gradient(to bottom, #ffffff 0%,#f2f2f2 100%); /* W3C */ } + .elgg-pagination .elgg-state-disabled span { - color: #CCCCCC; - border-color: #CCCCCC; + opacity: 0.3; +} +.elgg-pagination .elgg-state-selected span, .elgg-pagination a:active { + color: #eee; + + text-shadow: 0px 1px 1px #999, 0 -1px 1px #222; + + background: #4f4f4f; /* Old browsers */ + background: -moz-linear-gradient(top, #4f4f4f 0%, #7a7a7a 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4f4f4f), color-stop(100%,#7a7a7a)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #4f4f4f 0%,#7a7a7a 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #4f4f4f 0%,#7a7a7a 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #4f4f4f 0%,#7a7a7a 100%); /* IE10+ */ + background: linear-gradient(to bottom, #4f4f4f 0%,#7a7a7a 100%); /* W3C */ } -.elgg-pagination .elgg-state-selected span { - color: #555555; - border-color: #555555; } /* *************************************** @@ -49,16 +78,15 @@ *************************************** */ .elgg-tabs { margin-bottom: 5px; - border-bottom: 2px solid #cccccc; + border-bottom: 1px solid #999; display: table; width: 100%; } .elgg-tabs li { float: left; - border: 2px solid #ccc; + border: 1px solid transparent; border-bottom: 0; - background: #eee; - margin: 0 0 0 10px; + margin: 0 5px 0 0; -webkit-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; @@ -67,34 +95,37 @@ .elgg-tabs a { text-decoration: none; display: block; - padding: 3px 10px 0 10px; + padding: 1px 10px 0; text-align: center; height: 21px; - color: #999; + color: #333; + font-weight: bold; } .elgg-tabs a:hover { - background: #dedede; - color: #4690D6; + color: #ff4c12; } .elgg-tabs .elgg-state-selected { - border-color: #ccc; - background: white; + border-color: #999; + background: #eeeeee; + position: relative; + top: 1px; } .elgg-tabs .elgg-state-selected a { position: relative; - top: 2px; - background: white; + top: -1px; } /* *************************************** BREADCRUMBS *************************************** */ .elgg-breadcrumbs { - font-size: 80%; + /*font-size: 80%;*/ font-weight: bold; line-height: 1.2em; color: #bababa; + margin: 8px 0px; } + .elgg-breadcrumbs > li { display: inline-block; } @@ -108,7 +139,7 @@ color: #999; } .elgg-breadcrumbs > li > a:hover { - color: #0054a7; + color: #FF4C12; text-decoration: underline; } @@ -136,7 +167,7 @@ } .elgg-menu-topbar > li > a:hover { - color: #4690D6; + color: #ff4c12; text-decoration: none; } @@ -191,7 +222,7 @@ } .elgg-menu-site-default > li > a { - color: white; + color: #ed9239; } .elgg-menu-site > li > ul { @@ -205,16 +236,8 @@ .elgg-menu-site-default > .elgg-state-selected > a, .elgg-menu-site-default > li:hover > a { - background: white; - color: #555; - - -webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25); - -moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25); - box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25); - - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + color: white; + text-shadow: 0px 0px 4px #FFF; } .elgg-menu-site-more { @@ -235,8 +258,8 @@ } .elgg-menu-site-more > li > a { - background-color: white; - color: #555; + background-color: #333; + color: #ed9239; -webkit-border-radius: 0; -moz-border-radius: 0; @@ -248,7 +271,7 @@ } .elgg-menu-site-more > li > a:hover { - background: #4690D6; + text-shadow: 0px 0px 4px #FFF; color: white; } @@ -282,44 +305,48 @@ *************************************** */ .elgg-menu-filter { margin-bottom: 5px; - border-bottom: 2px solid #ccc; + border-bottom: 1px solid #999; display: table; width: 100%; } .elgg-menu-filter > li { float: left; - border: 2px solid #ccc; + border: 1px solid transparent; border-bottom: 0; - background: #eee; - margin: 0 0 0 10px; + margin: 0 5px 0 0; -webkit-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0; } .elgg-menu-filter > li:hover { - background: #dedede; + } .elgg-menu-filter > li > a { text-decoration: none; display: block; - padding: 3px 10px 0; + padding: 1px 10px 0; text-align: center; height: 21px; - color: #999; + color: #333; + font-weight: bold; + + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } .elgg-menu-filter > li > a:hover { - background: #dedede; - color: #4690D6; + color: #ff4c12; } .elgg-menu-filter > .elgg-state-selected { - border-color: #ccc; - background: white; + border-color: #999; + background: #eee; + position: relative; + top: 1px; } .elgg-menu-filter > .elgg-state-selected > a { position: relative; - top: 2px; - background: white; + top: -1px; } /* *************************************** @@ -332,22 +359,22 @@ .elgg-menu-page a { display: block; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; - - background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + font-weight: bold; + color: #333; margin: 0 0 3px; padding: 2px 4px 2px 8px; } .elgg-menu-page a:hover { - background-color: #0054A7; - color: white; + background-color: #333; + color: #eee; text-decoration: none; } .elgg-menu-page li.elgg-state-selected > a { - background-color: #4690D6; - color: white; + background-color: #333; + color: #eee; } .elgg-menu-page .elgg-child-menu { display: none; @@ -372,7 +399,10 @@ position: absolute; z-index: 10000; - width: 165px; + overflow: hidden; + + min-width: 165px; + max-width: 250px; border: solid 1px; border-color: #E5E5E5 #999 #999 #E5E5E5; background-color: #FFF; @@ -450,7 +480,7 @@ float: right; margin-left: 15px; font-size: 90%; - color: #aaa; + color: #666; line-height: 16px; height: 16px; } @@ -458,7 +488,7 @@ margin-left: 15px; } .elgg-menu-entity > li > a, .elgg-menu-annotation > li > a { - color: #aaa; + color: #666; } <?php // need to override .elgg-menu-hz ?> .elgg-menu-entity > li > a, .elgg-menu-annotation > li > a { @@ -473,23 +503,23 @@ *************************************** */ .elgg-menu-owner-block li a { display: block; + font-weight: bold; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; - - background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + color: #333; margin: 3px 0 5px 0; padding: 2px 4px 2px 8px; } .elgg-menu-owner-block li a:hover { - background-color: #0054A7; - color: white; + background-color: #333; + color: #eee; text-decoration: none; } .elgg-menu-owner-block li.elgg-state-selected > a { - background-color: #4690D6; - color: white; + background-color: #333; + color: #ccc; } /* *************************************** @@ -531,4 +561,26 @@ *************************************** */ .elgg-menu-extras { margin-bottom: 15px; -}
\ No newline at end of file +} + +/* *************************************** + WIDGET MENU +*************************************** */ +.elgg-menu-widget > li { + position: absolute; + top: 4px; + display: inline-block; + width: 18px; + height: 18px; + padding: 2px 2px 0 0; +} + +.elgg-menu-widget > .elgg-menu-item-collapse { + left: 5px; +} +.elgg-menu-widget > .elgg-menu-item-delete { + right: 5px; +} +.elgg-menu-widget > .elgg-menu-item-settings { + right: 25px; +} diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php index f080a29..f6b8549 100644 --- a/views/default/css/elements/typography.php +++ b/views/default/css/elements/typography.php @@ -10,14 +10,37 @@ /* *************************************** Typography *************************************** */ +@font-face { + font-family: "Open Sans"; + font-style: normal; + font-weight: 400; + src: url("<?php echo elgg_get_site_url(); ?>/mod/n1_theme/vendors/opensans/OpenSans-Regular.ttf"); +} + +@font-face { + font-family: "Open Sans"; + font-style: bold; + src: url("<?php echo elgg_get_site_url(); ?>/mod/n1_theme/vendors/opensans/OpenSans-Semibold.ttf"); + font-weight: 600; +} + +@font-face { + font-family: "Open Sans"; + font-style: italic; + src: url("<?php echo elgg_get_site_url(); ?>/mod/n1_theme/vendors/opensans/OpenSans-Italic.ttf"); + font-weight: 400; +} + + body { - font-size: 80%; + font-size: 72%; line-height: 1.4em; - font-family: "Lucida Grande", Arial, Tahoma, Verdana, sans-serif; + font-family: "Open Sans", Arial, Tahoma, Verdana, sans-serif; + color: #333333; } a { - color: #4690D6; + color: #ff4c12; } a:hover, @@ -37,10 +60,12 @@ p:last-child { pre, code { font-family: Monaco, "Courier New", Courier, monospace; font-size: 12px; + padding:2px; - background:#EBF5FF; - color:#000000; + background-color:#333; + color:#eee; overflow:auto; + /*box-shadow: 1px 1px 1px #333;*/ overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */ @@ -64,24 +89,27 @@ code { } blockquote { + line-height: 1.3em; - padding:3px 15px; - margin:0px 0 15px 0; - background:#EBF5FF; + padding:10px 20px 10px 10px; + margin:5px 5px 15px 20px; + background: #E6D37E url(<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/quotes.png) no-repeat right; border:none; + box-shadow: 0px 1px 3px #666; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; } h1, h2, h3, h4, h5, h6 { + color: #333; font-weight: bold; - color: #0054A7; } -h1 { font-size: 1.8em; } -h2 { font-size: 1.5em; line-height: 1.1em; padding-bottom:5px} +h1 { font-size: 2em; visibility: hidden;} +h2 { font-size: 1.8em; line-height: 1.1em; padding-bottom:5px} h3 { font-size: 1.2em; } h4 { font-size: 1.0em; } h5 { font-size: 0.9em; } @@ -101,9 +129,10 @@ h6 { font-size: 0.8em; } float: left; max-width: 530px; margin-right: 10px; + } .elgg-heading-basic { - color: #0054A7; + color: #616068; font-size: 1.2em; font-weight: bold; } @@ -119,6 +148,7 @@ h6 { font-size: 0.8em; } display: block; font-size: 85%; font-style: italic; + padding: 10px 0px 10px 0px; } .elgg-quiet { @@ -126,7 +156,7 @@ h6 { font-size: 0.8em; } } .elgg-loud { - color: #0054A7; + color: #d86c2c; } /* *************************************** @@ -134,12 +164,13 @@ h6 { font-size: 0.8em; } *************************************** */ .elgg-output { margin-top: 10px; + line-height: 1.7em; } .elgg-output dt { font-weight: bold } .elgg-output dd { margin: 0 0 1em 1em } -.elgg-output ul, ol { +.elgg-output ul, .elgg-output ol { margin: 0 1.5em 1.5em 0; padding-left: 1.5em; } @@ -158,4 +189,4 @@ h6 { font-size: 0.8em; } } .elgg-output img { max-width: 100%; -}
\ No newline at end of file +} diff --git a/views/default/css/elgg.php b/views/default/css/elgg.php index 4960e6a..37d8aa1 100644 --- a/views/default/css/elgg.php +++ b/views/default/css/elgg.php @@ -8,9 +8,9 @@ /* * Colors: - * #4690D6 - elgg light blue - * #0054A7 - elgg dark blue - * #e4ecf5 - elgg very light blue + * #ff4c12 - n-1 light orange + * #d86c2c - n-1 dark orange + * #e4ecf5 - n-1 very light orange */ // check if there is a theme overriding the old css view and use it, if it exists diff --git a/views/default/css/lightbox.php b/views/default/css/lightbox.php deleted file mode 100644 index 7d5917c..0000000 --- a/views/default/css/lightbox.php +++ /dev/null @@ -1,371 +0,0 @@ -<?php -/** - * Fancybox lightbox CSS. - * - * Used as a view because we need to pass a full URL to AlphaImageLoader. - * - * @package Elgg.Core - * @subpackage UI - */ - -$jquery_path = elgg_get_site_url() . 'vendors/jquery/'; -?> - -/* - * FancyBox - jQuery Plugin - * Simple and fancy lightbox alternative - * - * Examples and documentation at: http://fancybox.net - * - * Copyright (c) 2008 - 2010 Janis Skarnelis - * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated. - * - * Version: 1.3.4 (11/11/2010) - * Requires: jQuery v1.3+ - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ - -#fancybox-loading { - position: fixed; - top: 50%; - left: 50%; - width: 40px; - height: 40px; - margin-top: -20px; - margin-left: -20px; - cursor: pointer; - overflow: hidden; - z-index: 1104; - display: none; -} - -#fancybox-loading div { - position: absolute; - top: 0; - left: 0; - width: 40px; - height: 480px; - background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png'); -} - -#fancybox-overlay { - position: absolute; - top: 0; - left: 0; - width: 100%; - z-index: 1100; - display: none; -} - -#fancybox-tmp { - padding: 0; - margin: 0; - border: 0; - overflow: auto; - display: none; -} - -#fancybox-wrap { - position: absolute; - top: 0; - left: 0; - padding: 20px; - z-index: 1101; - outline: none; - display: none; -} - -#fancybox-outer { - position: relative; - width: 100%; - height: 100%; - background: #fff; -} - -#fancybox-content { - width: 0; - height: 0; - padding: 0; - outline: none; - position: relative; - overflow: hidden; - z-index: 1102; - border: 0px solid #fff; -} - -#fancybox-hide-sel-frame { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: transparent; - z-index: 1101; -} - -#fancybox-close { - position: absolute; - top: -15px; - right: -15px; - width: 30px; - height: 30px; - background: transparent url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -40px 0px; - cursor: pointer; - z-index: 1103; - display: none; -} - -#fancybox-error { - color: #444; - font: normal 12px/20px Arial; - padding: 14px; - margin: 0; -} - -#fancybox-img { - width: 100%; - height: 100%; - padding: 0; - margin: 0; - border: none; - outline: none; - line-height: 0; - vertical-align: top; -} - -#fancybox-frame { - width: 100%; - height: 100%; - border: none; - display: block; -} - -#fancybox-left, #fancybox-right { - position: absolute; - bottom: 0px; - height: 100%; - width: 35%; - cursor: pointer; - outline: none; - background: transparent url('<?php echo $jquery_path; ?>fancybox/blank.gif'); - z-index: 1102; - display: none; -} - -#fancybox-left { - left: 0px; -} - -#fancybox-right { - right: 0px; -} - -#fancybox-left-ico, #fancybox-right-ico { - position: absolute; - top: 50%; - left: -9999px; - width: 30px; - height: 30px; - margin-top: -15px; - cursor: pointer; - z-index: 1102; - display: block; -} - -#fancybox-left-ico { - background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png'); - background-position: -40px -30px; -} - -#fancybox-right-ico { - background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png'); - background-position: -40px -60px; -} - -#fancybox-left:hover, #fancybox-right:hover { - visibility: visible; /* IE6 */ -} - -#fancybox-left:hover span { - left: 20px; -} - -#fancybox-right:hover span { - left: auto; - right: 20px; -} - -.fancybox-bg { - position: absolute; - padding: 0; - margin: 0; - border: 0; - width: 20px; - height: 20px; - z-index: 1001; -} - -#fancybox-bg-n { - top: -20px; - left: 0; - width: 100%; - background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png'); -} - -#fancybox-bg-ne { - top: -20px; - right: -20px; - background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png'); - background-position: -40px -162px; -} - -#fancybox-bg-e { - top: 0; - right: -20px; - height: 100%; - background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-y.png'); - background-position: -20px 0px; -} - -#fancybox-bg-se { - bottom: -20px; - right: -20px; - background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png'); - background-position: -40px -182px; -} - -#fancybox-bg-s { - bottom: -20px; - left: 0; - width: 100%; - background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png'); - background-position: 0px -20px; -} - -#fancybox-bg-sw { - bottom: -20px; - left: -20px; - background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png'); - background-position: -40px -142px; -} - -#fancybox-bg-w { - top: 0; - left: -20px; - height: 100%; - background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-y.png'); -} - -#fancybox-bg-nw { - top: -20px; - left: -20px; - background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png'); - background-position: -40px -122px; -} - -#fancybox-title { - font-family: Helvetica; - font-size: 12px; - z-index: 1102; -} - -.fancybox-title-inside { - padding-bottom: 10px; - text-align: center; - color: #333; - background: #fff; - position: relative; -} - -.fancybox-title-outside { - padding-top: 10px; - color: #fff; -} - -.fancybox-title-over { - position: absolute; - bottom: 0; - left: 0; - color: #FFF; - text-align: left; -} - -#fancybox-title-over { - padding: 10px; - background-image: url('<?php echo $jquery_path; ?>fancybox/fancy_title_over.png'); - display: block; -} - -.fancybox-title-float { - position: absolute; - left: 0; - bottom: -20px; - height: 32px; -} - -#fancybox-title-float-wrap { - border: none; - border-collapse: collapse; - width: auto; -} - -#fancybox-title-float-wrap td { - border: none; - white-space: nowrap; -} - -#fancybox-title-float-left { - padding: 0 0 0 15px; - background: url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -40px -90px no-repeat; -} - -#fancybox-title-float-main { - color: #FFF; - line-height: 29px; - font-weight: bold; - padding: 0 0 3px 0; - background: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png') 0px -40px; -} - -#fancybox-title-float-right { - padding: 0 0 0 15px; - background: url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -55px -90px no-repeat; -} - -/* IE6 */ - -.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_close.png', sizingMethod='scale'); } - -.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_nav_left.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_nav_right.png', sizingMethod='scale'); } - -.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; } -.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_left.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_main.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_right.png', sizingMethod='scale'); } - -.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame { - height: expression(this.parentNode.clientHeight + "px"); -} - -#fancybox-loading.fancybox-ie6 { - position: absolute; margin-top: 0; - top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px'); -} - -#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_loading.png', sizingMethod='scale'); } - -/* IE6, IE7, IE8 */ -.fancybox-ie .fancybox-bg { background: transparent !important; } - -.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_n.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_ne.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_e.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_se.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_s.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_sw.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_w.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_nw.png', sizingMethod='scale'); }
\ No newline at end of file diff --git a/views/default/css/n1_theme/landing.php b/views/default/css/n1_theme/landing.php new file mode 100644 index 0000000..1343d51 --- /dev/null +++ b/views/default/css/n1_theme/landing.php @@ -0,0 +1,36 @@ +#n1-landing { + height: 250px; + background-image: url('<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/n1.png'); + background-repeat: no-repeat; + display: table; + margin: 30px 0 50px 0; +} + +#n1-landing-inner { + display: table-cell; + vertical-align: middle; + padding-left: 220px; + +} + +#n1-landing-title { + font-size: 1.7em; + font-weight: bold; +} + +#n1-landing-subtitle { + font-size: 1.4em; + color: #666; +} + +.elgg-sidebar h3 { + font-size: 1.6em; +} + +#login-dropdown { + display:none; +} + +.elgg-page-header > .elgg-inner { + background-image: none; +} diff --git a/views/default/css/walled_garden.php b/views/default/css/walled_garden.php index ea25435..f6f7f97 100644 --- a/views/default/css/walled_garden.php +++ b/views/default/css/walled_garden.php @@ -54,8 +54,8 @@ $url = elgg_get_site_url(); padding: 0 8px; } -.elgg-walledgarden-single > .elgg-body > .elgg-inner { - padding: 0 8px; +.elgg-walledgarden-single > .elgg-body { + padding: 0 18px; } .elgg-module-walledgarden-login { @@ -68,7 +68,14 @@ $url = elgg_get_site_url(); } .elgg-heading-walledgarden { - color: #666666; margin-top: 60px; line-height: 1.1em; } + +h1, h2, h3, h4, h5, h6 { + color: #666; +} + +a { + color: #999; +}
\ No newline at end of file diff --git a/views/default/n1_theme/css.php b/views/default/n1_theme/css.php new file mode 100644 index 0000000..db9fa46 --- /dev/null +++ b/views/default/n1_theme/css.php @@ -0,0 +1,107 @@ +.profile-content-menu a { + background-color: transparent; +} + +.profile-admin-menu-wrapper { + background-color: #eee; + +} + +.profile-admin-menu-wrapper a:hover { + background-color: #333; + color: #eee; + text-decoration: none; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + +.profile-admin-menu-wrapper li a { + background: none; + color: #333; +} + +#profile-details h2 { + font-weight: bold; +} + +.elgg-access, .elgg-input-access > option { + padding-left: 19px; + background-image: url('<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/privacy.png'); + background-repeat: no-repeat; +} + +.elgg-access { + padding-top: 1px; + padding-bottom: 1px; +} + +.elgg-access-private, .elgg-input-access > option[value="<?php echo ACCESS_PRIVATE; ?>"] { + background-position: 0 -65px; +} + +.elgg-access-friends, .elgg-input-access > option[value="<?php echo ACCESS_FRIENDS; ?>"] { + background-position: 0 -51px; +} + +.elgg-access-loggedin, .elgg-input-access > option[value="<?php echo ACCESS_LOGGED_IN; ?>"] { + background-position: 0 -34px; +} + +.elgg-access-public, .elgg-input-access > option[value="<?php echo ACCESS_PUBLIC; ?>"] { + background-position: 0 -16px; +} + +.elgg-access-group, .elgg-input-access > option { + background-position: 0 0; +} + +.file-photo { + margin-top: 15px; +} + +.tasklist-graph { + border: 1px solid #bbb; +} + +.tasklist-graph div { + background-color: #444; +} + +.elgg-task-icon { + box-shadow: none; +} + +.treeview a.selected { + background-color: transparent !important; +} + +.tidypics-heading { + color: #FF4C12; +} + +.tidypics-heading:hover { + color: #333; +} + +.tidypics-gallery .elgg-head { + margin: 10px; +} + +#cboxTitle h3 { + color: #eee; + font-weight: bold; + font-size: 160%; +} + +.groups-profile-icon { + height: 201px; + border: 2px solid #F1F1F1; + box-shadow: 0px 1px 3px #666; +} + +.elgg-page .cke_skin_BootstrapCK-Skin .cke_contents, .cke_skin_BootstrapCK-Skin .cke_contents iframe { + background-color: #F7F7F7 !important; + border: none !important; +} diff --git a/views/default/n1_theme/landing.php b/views/default/n1_theme/landing.php new file mode 100644 index 0000000..83132a9 --- /dev/null +++ b/views/default/n1_theme/landing.php @@ -0,0 +1,13 @@ +<?php + +$title = elgg_echo('n1_theme:landing:title'); +$subtitle = elgg_echo('n1_theme:landing:subtitle'); + +echo <<<HTML +<div id="n1-landing"> +<div id="n1-landing-inner"> +<p id="n1-landing-title">$title</p> +<p id="n1-landing-subtitle">$subtitle</p> +</div> +</div> +HTML; diff --git a/views/default/output/access.php b/views/default/output/access.php new file mode 100644 index 0000000..fdb8fe1 --- /dev/null +++ b/views/default/output/access.php @@ -0,0 +1,53 @@ +<?php +/** + * Displays HTML for entity access levels. + * Requires an entity because some special logic for containers is used. + * + * @uses int $vars['entity'] - The entity whose access ID to display. + */ + +//sort out the access level for display +if (isset($vars['entity']) && elgg_instanceof($vars['entity'])) { + $access_id = $vars['entity']->access_id; + $access_class = 'elgg-access'; + $access_id_string = get_readable_access_level($access_id); + $access_id_string = htmlentities($access_id_string, ENT_QUOTES, 'UTF-8'); + + // if within a group or shared access collection display group name and open/closed membership status + // @todo have a better way to do this instead of checking against subtype / class. + $container = $vars['entity']->getContainerEntity(); + + if ($container && $container instanceof ElggGroup) { + // we decided to show that the item is in a group, rather than its actual access level + // not required. Group ACLs are prepended with "Group: " when written. + //$access_id_string = elgg_echo('groups:group') . $container->name; + $membership = $container->membership; + + if ($membership == ACCESS_PUBLIC) { + $access_class .= ' elgg-access-group-open'; + } else { + $access_class .= ' elgg-access-group-closed'; + } + } + + switch ($access_id) { + case ACCESS_PRIVATE: + $access_class .= ' elgg-access-private'; + break; + case ACCESS_FRIENDS: + $access_class .= ' elgg-access-friends'; + break; + case ACCESS_LOGGED_IN: + $access_class .= ' elgg-access-loggedin'; + break; + case ACCESS_PUBLIC: + $access_class .= ' elgg-access-public'; + break; + default: + $access_class .= ' elgg-access-group'; + } + + $help_text = elgg_echo('access:help'); + + echo "<span title=\"$help_text\" class=\"$access_class\">$access_id_string</span>"; +} diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php new file mode 100644 index 0000000..b8e6c11 --- /dev/null +++ b/views/default/river/elements/body.php @@ -0,0 +1,67 @@ +<?php +/** + * Body of river item + * + * @uses $vars['item'] ElggRiverItem + * @uses $vars['summary'] Alternate summary (the short text summary of action) + * @uses $vars['message'] Optional message (usually excerpt of text) + * @uses $vars['attachments'] Optional attachments (displaying icons or other non-text data) + * @uses $vars['responses'] Alternate respones (comments, replies, etc.) + */ + +$item = $vars['item']; + +$menu = elgg_view_menu('river', array( + 'item' => $item, + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz', +)); + +// river item header +$timestamp = elgg_view_friendly_time($item->getPostedTime()); + +$summary = elgg_extract('summary', $vars, elgg_view('river/elements/summary', array('item' => $vars['item']))); +if ($summary === false) { + $subject = $item->getSubjectEntity(); + $summary = elgg_view('output/url', array( + 'href' => $subject->getURL(), + 'text' => $subject->name, + 'class' => 'elgg-river-subject', + 'is_trusted' => true, + )); +} + +$message = elgg_extract('message', $vars, false); +if ($message) { + $message = "<div class=\"elgg-river-message\">$message</div>"; +} + +$attachments = elgg_extract('attachments', $vars, false); +if ($attachments) { + $attachments = "<div class=\"elgg-river-attachments clearfix\">$attachments</div>"; +} + +$responses = elgg_view('river/elements/responses', $vars); +if ($responses) { + $responses = "<div class=\"elgg-river-responses\">$responses</div>"; +} + +$group_string = ''; +$object = $item->getObjectEntity(); +$container = $object->getContainerEntity(); +if ($container instanceof ElggGroup && $container->guid != elgg_get_page_owner_guid()) { + $group_link = elgg_view('output/url', array( + 'href' => $container->getURL(), + 'text' => $container->name, + 'is_trusted' => true, + )); + $group_string = elgg_echo('river:ingroup', array($group_link)); +} + +echo <<<RIVER +$menu +<div class="elgg-river-summary">$summary $group_string <span class="elgg-river-timestamp">$timestamp</span></div> +$message +$attachments +$responses +RIVER; diff --git a/views/default/search/css.php b/views/default/search/css.php new file mode 100644 index 0000000..4e5e88c --- /dev/null +++ b/views/default/search/css.php @@ -0,0 +1,57 @@ +<?php +/** + * Elgg Search css + * + */ +?> + +/********************************** +Search plugin +***********************************/ +.elgg-search-header { + bottom: 15px; + height: 23px; + position: absolute; + right: 0; +} +.elgg-search input[type=text] { + width: 230px; + +} +.elgg-search input[type=submit] { + display: none; +} +.elgg-search input[type=text] { + border: 0; + background: #EEE url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 210px -916px; + height: 20px; + font-size: 1em; + margin-top: 13px; +} + +.search-list li { + padding: 5px 0 0; +} +.search-heading-category { + margin-top: 20px; + color: #666666; +} + +.search-highlight { + background-color: #FFF01C; +} +.search-highlight-color1 { + background-color: #FFF01C; +} +.search-highlight-color2 { + background-color: #BFF553; +} +.search-highlight-color3 { + background-color: #F062A4; +} +.search-highlight-color4 { + background-color: #ccc; +} +.search-highlight-color5 { + background-color: #4690d6; +} |
