From c5a1fb731bcff53cb500c9db5151255a7643a7cd Mon Sep 17 00:00:00 2001 From: Adrian Malacoda Date: Sun, 7 Aug 2016 18:08:17 -0500 Subject: [PATCH] A lot of the linking/attribute generation stuff has been split into Linker class --- application/w/skins/GCL3.php | 43 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/application/w/skins/GCL3.php b/application/w/skins/GCL3.php index 2ae2eb2d..4eb912b9 100755 --- a/application/w/skins/GCL3.php +++ b/application/w/skins/GCL3.php @@ -69,7 +69,7 @@ class GCL3Template extends QuickTemplate { $smf_head = str_replace(' ',"",$smf_head); $mw_head = str_replace("",$smf_head,$mw_head); - + echo $mw_head; } /** @@ -138,7 +138,7 @@ class GCL3Template extends QuickTemplate { } $new_title = implode("/",$linkzor2); foreach($this->data['content_actions'] as $key => $tab) { - $linx[] = 'tooltipAndAccesskeyAttribs('ca-'.$key).'>'.htmlspecialchars($tab['text']).''; + $linx[] = ''.htmlspecialchars($tab['text']).''; } ?> @@ -187,9 +187,9 @@ class GCL3Template extends QuickTemplate { # used for editing in Safari. if( in_array( $action, array( 'edit', 'submit' ) ) && in_array( $key, array( 'edit', 'watch', 'unwatch' ))) { - echo $skin->tooltip( "ca-$key" ); + echo Linker::tooltip( "ca-$key" ); } else { - echo $skin->tooltipAndAccesskeyAttribs( "ca-$key" ); + echo Linker::tooltipAndAccesskeyAttribs( "ca-$key" ); } echo '>'.htmlspecialchars($tab['text']).''; } ?> @@ -204,7 +204,7 @@ class GCL3Template extends QuickTemplate { data['personal_urls'] as $key => $item) { ?>
  • " class="active">tooltipAndAccesskeyAttribs('pt-'.$key) ?>" class="">
    • @@ -215,7 +215,7 @@ class GCL3Template extends QuickTemplate { @@ -282,12 +282,12 @@ if($this->data['copyrightico']) { ?> isset( $this->data['search'] ) ? $this->data['search'] : '', 'search', array( 'id' => 'searchInput', - 'title' => $this->skin->titleAttrib( 'search' ), - 'accesskey' => $this->skin->accesskey( 'search' ) + 'title' => Linker::titleAttrib( 'search' ), + 'accesskey' => Linker::accesskey( 'search' ) ) ); ?> - skin->tooltipAndAccesskeyAttribs( 'search-go' ); ?> />  - skin->tooltipAndAccesskeyAttribs( 'search-fulltext' ); ?> /> + />  + />
    @@ -309,23 +309,23 @@ if($this->data['copyrightico']) { ?> if($this->data['notspecialpage']) { ?>
  • skin->tooltipAndAccesskeyAttribs('t-whatlinkshere') ?>>msg('whatlinkshere') ?>
    • + ?>">msg('whatlinkshere') ?> data['nav_urls']['recentchangeslinked'] ) { ?>
  • skin->tooltipAndAccesskeyAttribs('t-recentchangeslinked') ?>>msg('recentchangeslinked-toolbox') ?>
    • + ?>">msg('recentchangeslinked-toolbox') ?> data['nav_urls']['trackbacklink'] ) && $this->data['nav_urls']['trackbacklink'] ) { ?> + ?>">msg('trackbacklink') ?> data['feeds']) { ?> data['copyrightico']) { ?> if($this->data['nav_urls'][$special]) { ?>
  • skin->tooltipAndAccesskeyAttribs('t-'.$special) ?>>msg($special) ?>
    • + ?>">msg($special) ?> data['nav_urls']['print']['href'])) { ?>
  • skin->tooltipAndAccesskeyAttribs('t-print') ?>>msg('printableversion') ?>
    • " rel="alternate">msg('printableversion') ?>data['nav_urls']['permalink']['href'])) { ?> ">msg('permalink') ?>data['nav_urls']['permalink']['href'] === '') { ?> - >msg('permalink') ?>data['copyrightico']) { ?> /*************************************************************************************************/ function languageBox() { if( $this->data['language_urls'] ) { -?> +?>
    @@ -383,14 +383,14 @@ if($this->data['copyrightico']) { ?> function customBox( $bar, $cont ) { ?> -
    skin->tooltip('p-'.$bar) ?>> +
    >

    THERE; } -