From: Evan Prodromou Date: Thu, 10 Mar 2011 16:53:11 +0000 (-0600) Subject: use jquery-ui for input_forms tabset X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c4bada902296ec8d77c232a0a638b0dd60aa1bd0;p=quix0rs-gnu-social.git use jquery-ui for input_forms tabset --- diff --git a/js/util.js b/js/util.js index cc95a08bf5..67e28485e4 100644 --- a/js/util.js +++ b/js/util.js @@ -1276,22 +1276,6 @@ var SN = { // StatusNet return false; }, - - /** - * Switch to another active input sub-form. - * This will hide the current form (if any), show the new one, and - * update the input type tab selection state. - * - * @param {String} tag - */ - switchInputFormTab: function(tag) { - // The one that's current isn't current anymore - $('.input_form_nav_tab.current').removeClass('current'); - $('#input_form_nav_'+tag).addClass('current'); - - $('.input_form.current').removeClass('current'); - $('#input_form_'+tag).addClass('current'); - } }, Init: { diff --git a/lib/action.php b/lib/action.php index 7614f4be3a..686b512a2c 100644 --- a/lib/action.php +++ b/lib/action.php @@ -315,6 +315,7 @@ class Action extends HTMLOutputter // lawsuit $this->showScriptMessages(); // Frame-busting code to avoid clickjacking attacks. $this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }'); + $this->inlineScript('$(document).ready(function(){ $(\'#input_forms\').tabs(); });'); Event::handle('EndShowStatusNetScripts', array($this)); Event::handle('EndShowLaconicaScripts', array($this)); } @@ -592,7 +593,7 @@ class Action extends HTMLOutputter // lawsuit { $tabs = array('status' => _('Status')); - $this->elementStart('div', 'input_forms'); + $this->elementStart('div', array('id' => 'input_forms')); if (Event::handle('StartShowEntryForms', array(&$tabs))) { @@ -611,7 +612,7 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('li', $attrs); $this->element('a', - array('href' => 'javascript:SN.U.switchInputFormTab("'.$tag.'")'), + array('href' => '#input_forms-'.$tag), $title); $this->elementEnd('li'); } @@ -621,7 +622,7 @@ class Action extends HTMLOutputter // lawsuit foreach ($tabs as $tag => $title) { $attrs = array('class' => 'input_form', - 'id' => 'input_form_'.$tag); + 'id' => 'input_forms-'.$tag); if ($tag == 'status') { $attrs['class'] .= ' current'; diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css index c1ac1e8f4d..f7a9486f24 100644 --- a/theme/rebase/css/display.css +++ b/theme/rebase/css/display.css @@ -1962,18 +1962,6 @@ margin-bottom:18px; padding-left:20px; } -#input_form_nav { - list-style-type: none; -} - -#input_form_nav li { - display:inline; -} - -.input_form_nav_tab.current { - text-decoration: underline; -} - .input_form { display: none; }