Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/91785


Change subject: Regression: Ensure last modified link renders consistently when 
dynamically loaded
......................................................................

Regression: Ensure last modified link renders consistently when dynamically 
loaded

Change-Id: Icbad73ed773364b93ad49be695496b9c4ca389f1
---
M includes/skins/MinervaTemplate.php
M templates/page.html
2 files changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/85/91785/1

diff --git a/includes/skins/MinervaTemplate.php 
b/includes/skins/MinervaTemplate.php
index 17696a2..2e4bedd 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -152,7 +152,6 @@
 
        protected function renderContentWrapper( $data ) {
                ?>
-               <div id="content_wrapper">
                        <?php
                                if ( !$this->isSpecialPage ) {
                                        echo $data['prebodytext'];
@@ -165,7 +164,6 @@
                                }
                                $this->renderContent( $data );
                        ?>
-               </div>
                <?php
        }
 
@@ -233,8 +231,12 @@
                                <script>
                                        mw.mobileFrontend.emit( 'header-loaded' 
);
                                </script>
+                               <div id="content_wrapper">
                                <?php
                                        $this->renderContentWrapper( $data );
+                               ?>
+                               </div>
+                               <?php
                                        $this->renderFooter( $data );
                                ?>
                        </div>
diff --git a/templates/page.html b/templates/page.html
index 3355113..5fb1c83 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,3 +1,8 @@
+{{#inBetaOrAlpha}}
+<a href="{{historyUrl}}" id="mw-mf-last-modified" 
data-timestamp="{{lastModifiedTimestamp}}"
+       data-user-name="{{lastModifiedUserName}}" 
data-user-gender="{{lastModifiedUserGender}}" class="top-bar  "
+       ></a>
+{{/inBetaOrAlpha}}
 <h1 id="section_0">{{title}}</h1>
 <ul id="page-actions" class="hlist">
        <li id="ca-edit"></li><li id="ca-upload">
@@ -19,7 +24,9 @@
        {{#inBetaOrAlpha}}<div id="page-secondary-actions">{{/inBetaOrAlpha}}
        <div class="section" id="mw-mf-language-section"></div>
        {{#inBetaOrAlpha}}</div>{{/inBetaOrAlpha}}
+       {{^inBetaOrAlpha}}
        <a href="{{historyUrl}}" id="mw-mf-last-modified" 
data-timestamp="{{lastModifiedTimestamp}}"
                data-user-name="{{lastModifiedUserName}}" 
data-user-gender="{{lastModifiedUserGender}}"
                ></a>
+       {{/inBetaOrAlpha}}
 </div>

-- 
To view, visit https://gerrit.wikimedia.org/r/91785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbad73ed773364b93ad49be695496b9c4ca389f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to