git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 6b06de5c authored by buttle's avatar buttle

moved docs nav to aside

parent 8bc63932
......@@ -6,7 +6,7 @@ and install into
$GNUSOCIAL_ROOT/theme/sants
and $GNUSOCIAL_ROOT/config.php
$config['site']['theme'] = 'sants-theme';
$config['site']['theme'] = 'sants';
2. - Second.
Download sants plugin
......
......@@ -172,9 +172,6 @@ class SantsPlugin extends Plugin
*/
public function onRouterInitialized(URLMapper $m)
{
$m->connect('main/hello',
array('action' => 'hello'));
$m->connect('main/hello1',
array('action' => 'hello1'));
......@@ -281,6 +278,39 @@ class SantsPlugin extends Plugin
return true;
}
function onStartProfilePageProfileSection($action)
{
return true;
}
function onStartDocNav($nav)
{
$menu = new SantsMenu($nav->action);
$bn = new SantsDefaultLocalNav($menu->action);
$menu->submenu(_m('MENU','Default'), $bn);
//$docs = new DocListNav($nav->action);
//$nav->submenu(_m('MENU','Docs'), $docs);
if ($nav->action->getActionName() == 'doc'){
$bn = new SantsDocumentsNav($menu->action);
$menu->submenu(_m('MENU','Default'), $bn);
}
return false;
}
function onStartSecondaryNav($action)
{
return true;
$menu = new SantsMenu($action);
$bn = new SantsSecondaryNav($menu->action);
$menu->submenu(_m('MENU','Default'), $bn);
}
function onPluginVersion(&$versions)
{
......
......@@ -25,7 +25,7 @@
display: block;
float: left;
height: 26px;
padding: 2px 10px 0 0;
padding: 2px 6px 0 0;
}
#site_nav_global_primary i:hover
{
......@@ -67,7 +67,8 @@
font-size: 20px;
border-top: 3px solid #A6ADBF;
border-bottom: 3px solid #A6ADBF;
}
clear:both;
}
.third_level_menu li:first-of-type, #site_nav_object > .nav li:first-of-type {
margin-top:5px;
}
......
......@@ -37,3 +37,12 @@ Font license info
Homepage: http://aristeides.com/
## Typicons
(c) Stephen Hutchings 2012
Author: Stephen Hutchings
License: SIL (http://scripts.sil.org/OFL)
Homepage: http://typicons.com/
......@@ -30,6 +30,12 @@
"code": 59394,
"src": "entypo"
},
{
"uid": "85fda3129wk4amvn25wrq843sbj3yzl0",
"css": "info",
"code": 59400,
"src": "typicons"
},
{
"uid": "018571e697f22ca41803de480e10ed10",
"css": "home",
......
......@@ -6,4 +6,5 @@
.icon-wrench:before { content: '\e804'; } /* '' */
.icon-torso:before { content: '\e805'; } /* '' */
.icon-cog:before { content: '\e806'; } /* '' */
.icon-comment:before { content: '\e807'; } /* '' */
\ No newline at end of file
.icon-comment:before { content: '\e807'; } /* '' */
.icon-info:before { content: '\e808'; } /* '' */
\ No newline at end of file
This diff is collapsed.
......@@ -6,4 +6,5 @@
.icon-wrench { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-torso { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-comment { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
\ No newline at end of file
.icon-comment { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-info { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
\ No newline at end of file
......@@ -17,4 +17,5 @@
.icon-wrench { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-torso { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-comment { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
\ No newline at end of file
.icon-comment { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-info { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
\ No newline at end of file
@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?71123095');
src: url('../font/fontello.eot?71123095#iefix') format('embedded-opentype'),
url('../font/fontello.woff?71123095') format('woff'),
url('../font/fontello.ttf?71123095') format('truetype'),
url('../font/fontello.svg?71123095#fontello') format('svg');
src: url('../font/fontello.eot?71312806');
src: url('../font/fontello.eot?71312806#iefix') format('embedded-opentype'),
url('../font/fontello.woff?71312806') format('woff'),
url('../font/fontello.ttf?71312806') format('truetype'),
url('../font/fontello.svg?71312806#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
......@@ -14,7 +14,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('../font/fontello.svg?71123095#fontello') format('svg');
src: url('../font/fontello.svg?71312806#fontello') format('svg');
}
}
*/
......@@ -57,4 +57,5 @@
.icon-wrench:before { content: '\e804'; } /* '' */
.icon-torso:before { content: '\e805'; } /* '' */
.icon-cog:before { content: '\e806'; } /* '' */
.icon-comment:before { content: '\e807'; } /* '' */
\ No newline at end of file
.icon-comment:before { content: '\e807'; } /* '' */
.icon-info:before { content: '\e808'; } /* '' */
\ No newline at end of file
......@@ -266,6 +266,9 @@ body {
<div title="Code: 0xe806" class="the-icons span3"><i class="icon-cog"></i> <span class="i-name">icon-cog</span><span class="i-code">0xe806</span></div>
<div title="Code: 0xe807" class="the-icons span3"><i class="icon-comment"></i> <span class="i-name">icon-comment</span><span class="i-code">0xe807</span></div>
</div>
<div class="row">
<div title="Code: 0xe808" class="the-icons span3"><i class="icon-info"></i> <span class="i-name">icon-info</span><span class="i-code">0xe808</span></div>
</div>
</div>
<div class="container footer">Generated by <a href="http://fontello.com">fontello.com</a></div>
</body>
......
No preview for this file type
......@@ -14,6 +14,7 @@
<glyph glyph-name="torso" unicode="&#xe805;" d="m0-150l0 358 338 144q-61 37-92 101t-31 133q0 104 64 184t162 80q102-4 164-83t63-181q-2-74-33-136t-86-98l334-145 0-357-883 0z" horiz-adv-x="883" />
<glyph glyph-name="cog" unicode="&#xe806;" d="m0 272l0 156 150 16q14 45 38 88l-96 117 109 109 117-95q41 23 88 37l16 150 156 0 16-150q45-14 88-37l117 95 109-109-96-117q24-43 38-88l150-16 0-156-150-16q-14-47-38-88l96-117-109-109-117 96q-43-24-88-38l-16-150-156 0-16 150q-47 14-88 38l-117-96-109 109 96 117q-24 41-38 88z m355 78q0-60 42-102t103-42 103 42 42 102-42 103-103 42-103-42-42-103z" horiz-adv-x="1000" />
<glyph glyph-name="comment" unicode="&#xe807;" d="m1000 350q0-97-67-179t-182-130-251-48q-39 0-81 4-110-97-257-135-27-8-63-12-10-1-17 5t-10 16v1q-2 2 0 6t1 6 2 5l4 5t4 5 4 5q4 5 17 19t20 22 17 22 18 28 15 33 15 42q-88 50-138 123t-51 157q0 73 40 139t106 114 160 76 194 28q136 0 251-48t182-130 67-179z" horiz-adv-x="1000" />
<glyph glyph-name="info" unicode="&#xe808;" d="m331 37q18 6 30-12t-4-34q-5-5-22-16t-59-26-84-15q-109 0-149 79-35 74 13 167l52 104q28 55 3 73-5 5-22 5-11 0-24-3t-22-5l-7-2q-19-7-31 11t4 32q7 7 22 17t58 26 84 16q111 0 150-79 35-73-12-167l-53-104q-27-56-2-74 3-3 21-3 11 0 24 2t22 5z m-174 600q0 130 130 130t130-130-130-130-130 130z" horiz-adv-x="417" />
</font>
</defs>
</svg>
\ No newline at end of file
No preview for this file type
<?php
/**
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2011, StatusNet, Inc.
*
* Secondary menu, shown at foot of all pages
*
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Cache
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
if (!defined('STATUSNET')) {
// This check helps protect against security problems;
// your code file can't be executed directly from the web.
exit(1);
}
/**
* Secondary menu, shown at the bottom of all pages
*
* @category General
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class SantsDocumentsNav extends SantsMenu
{
function show()
{
$this->out->elementStart('ul', array('class' => 'nav third_level_menu'));
//if (Event::handle('StartSecondaryNav', array($this->action))) {
$this->out->menuItem(common_local_url('doc', array('title' => 'help')),
// TRANS: Secondary navigation menu item leading to help on StatusNet.
_m('MENU','Help'));
$this->out->menuItem(common_local_url('doc', array('title' => 'about')),
// TRANS: Secondary navigation menu item leading to text about StatusNet site.
_m('MENU','About'));
$this->out->menuItem(common_local_url('doc', array('title' => 'faq')),
// TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
_m('MENU','FAQ'));
$bb = common_config('site', 'broughtby');
if (!empty($bb)) {
$this->out->menuItem(common_local_url('doc', array('title' => 'tos')),
// TRANS: Secondary navigation menu item leading to Terms of Service.
_m('MENU','TOS'));
}
$this->out->menuItem(common_local_url('doc', array('title' => 'privacy')),
// TRANS: Secondary navigation menu item leading to privacy policy.
_m('MENU','Privacy'));
$this->out->menuItem(common_local_url('doc', array('title' => 'source')),
// TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
_m('MENU','Source'));
$this->out->menuItem(common_local_url('doc', array('title' => 'contact')),
// TRANS: Secondary navigation menu item leading to e-mail contact information on the
// TRANS: StatusNet site, where to report bugs, ...
_m('MENU','Contact'));
Event::handle('EndSecondaryNav', array($this->action));
//}
$this->out->elementEnd('ul');
//$this->action->element('style', null, '.profile_block{ display:none; }');
}
}
......@@ -68,6 +68,13 @@ class SantsPrimaryNav extends Menu
$this->action->element('i', array('class'=>'icon-search'), '');
$this->action->elementEnd('a');
$attrs=array();
$attrs['href'] = common_local_url('doc',array('title'=>'help'));
$attrs['title'] = _m('Information');
$this->action->elementStart('a', $attrs);
$this->action->element('i', array('class'=>'icon-info'), '');
$this->action->elementEnd('a');
if(empty($user)){
$attrs=array();
$attrs['href'] = common_local_url('login');
......
......@@ -15,10 +15,11 @@ $(function() {
var windowHeight = $(window).height();
var contentHeight = $('#content').height();
var footerHeight = $('#footer').height();
asideHeight = windowHeight - headerHeight + footerHeight;
$('#aside_primary').height(asideHeight);
if (asideHeight > contentHeight){
$('#content').height(asideHeight + 42);
var requiredHeight = windowHeight - headerHeight + footerHeight;
if (requiredHeight > contentHeight){
$('#content').height(requiredHeight+40);
$('#aside_primary').height(requiredHeight);
}
}
scrollToContent();
......@@ -30,7 +31,7 @@ $(function() {
$("#site_nav_global_primary").find('.icon-comment').hide();
}
if( $('.third_level_menu').length > 0 ){
$('.third_level_menu').prependTo('#aside_primary');
$('.third_level_menu').appendTo('#aside_primary');
}
$('#sants_nav_local_default').prependTo('#site_nav_local_views');
......@@ -49,7 +50,6 @@ $(function() {
if (scroll_top > sticky_navigation_offset_top) {
$('#site_nav_global_primary').css({ 'position': 'fixed', 'top':0, 'left':'auto', 'right':'auto' });
if( !$('#goto_top').is(":visible")){
//item = $('#site_nav_local_views').find('.current').find('a');
item = $('#content').find('h1');
title = item.html();
if(title != '&nbsp;'){
......@@ -58,14 +58,12 @@ $(function() {
}
$('#global_nav_options').fadeIn();
$('#site_contact').hide();
//$('#site_notice').hide();
}
} else if( $('#goto_top').is(":visible") ){
$("#site_nav_global_primary").find('.input_forms').fadeOut('fast');
$('#site_nav_global_primary').css({ 'position': 'relative' });
$('#global_nav_options').hide();
$('#site_contact').fadeIn();
//$('#site_notice').show();
}
};
......@@ -87,8 +85,8 @@ function toggleDentForm(){
if ($('#site_notice:in-viewport')){
scrollToContent();
}
SN.U.switchInputFormTab("status");
main_dent_form.show(0, function() {
//$("#content").find('.input_forms:in-viewport')
scrollToContent();
main_dent_form.find('textarea').addClass('glow');
main_dent_form.find('textarea').focus();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment