Merge branch 'master' of gitorious.org:social/mainline into social-master

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>

diff --git a/js/util.js b/js/util.js
index 793626ed25bfd580374415bdd980d1e3ebceeae6..2861580456b4866ea3167e50fa41624f02b2f5c3 100644 (file)
--- 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 e44e4eb168e5535c8d5587c7670806c7e8364117..0aabef4abb5eb800e589ea5364431b429331d36a 100644 (file)
--- 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 10ce1fe4d038bd46ad9dfca9ef740a7f82385a12..b52c74e5ab31c127049fca2cb262721da0bf6420 100644 (file)
--- 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 3c63e928dcf6361c67c333f179cbb11362565b9d..5453312947ce1da165a59dff1d6738964162b5b4 100644 (file)
--- 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;