From 8892702f0cf84ca7b74ef8fdbb785e3155637c72 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Fri, 16 Jan 2015 11:19:22 +0100 Subject: [PATCH] Initially hide input forms on the top The status input element would attract focus after page load, meaning if you'd scrolled down a bit then you would be rocketed back up again! --- js/util.js | 4 ++-- lib/action.php | 2 ++ lib/framework.php | 2 +- theme/base/css/display.css | 6 ++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/js/util.js b/js/util.js index 793626ed25..2861580456 100644 --- a/js/util.js +++ b/js/util.js @@ -1437,8 +1437,8 @@ var SN = { // StatusNet // SN.Init.NoticeFormSetup() will get run // when forms get displayed for the first time... - // Initially show Status tab - SN.U.switchInputFormTab("status"); + // Initially hide all tabs on the top of the page + SN.U.switchInputFormTab(null); // Make inline reply forms self-close when clicking out. $('body').on('click', function (e) { diff --git a/lib/action.php b/lib/action.php index cc02305ffe..f3a125d3b5 100644 --- a/lib/action.php +++ b/lib/action.php @@ -726,6 +726,8 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('div', 'input_forms'); + $this->element('label', array('for'=>'input_form_nav'), _m('TAB', 'Share your:')); + if (Event::handle('StartShowEntryForms', array(&$tabs))) { $this->elementStart('ul', array('class' => 'nav', 'id' => 'input_form_nav')); diff --git a/lib/framework.php b/lib/framework.php index 553bfcccfa..f76db7fbab 100644 --- a/lib/framework.php +++ b/lib/framework.php @@ -23,7 +23,7 @@ define('GNUSOCIAL_ENGINE', 'GNU social'); define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/'); define('GNUSOCIAL_BASE_VERSION', '1.1.3'); -define('GNUSOCIAL_LIFECYCLE', 'beta'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' +define('GNUSOCIAL_LIFECYCLE', 'beta1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 3c63e928dc..5453312947 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -254,6 +254,12 @@ address .poweredby { width: 100%; } +.input_forms > label { + float: left; + margin-right: 1em; + opacity: 0.6; +} + #input_form_nav { float: left; margin-bottom: 10px; -- 2.39.5