[MediaWiki-commits] [Gerrit] Only show one Older edit and one Newer edit link - change (mediawiki...Flow)

2015-07-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Only show one Older edit and one Newer edit link
..


Only show one Older edit and one Newer edit link

We were showing both links on both sides. Instead, only
show the Older link on the left and the Newer link
on the right.

Change-Id: I85b306dab82097fd44383e2e5ea1b008b9f5964e
---
M handlebars/compiled/flow_revision_diff_header.handlebars.php
M handlebars/flow_revision_diff_header.handlebars
2 files changed, 7 insertions(+), 5 deletions(-)

Approvals:
  Matthias Mullie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/handlebars/compiled/flow_revision_diff_header.handlebars.php 
b/handlebars/compiled/flow_revision_diff_header.handlebars.php
index a33f98e..7931324 100644
--- a/handlebars/compiled/flow_revision_diff_header.handlebars.php
+++ b/handlebars/compiled/flow_revision_diff_header.handlebars.php
@@ -38,8 +38,6 @@
/a
 
 '.((LCRun3::ifvar($cx, ((isset($in['new'])  is_array($in)) ? $in['new'] : 
null))) ? ''.((LCRun3::ifvar($cx, ((isset($in['revision']['actions']['undo']) 
 is_array($in['revision']['actions'])) ? $in['revision']['actions']['undo'] : 
null))) ? '('.htmlentities((string)((isset($in['noop'])  is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'a class=mw-ui-anchor mw-ui-quiet 
href='.htmlentities((string)((isset($in['revision']['actions']['undo']['url']) 
 is_array($in['revision']['actions']['undo'])) ? 
$in['revision']['actions']['undo']['url'] : null), ENT_QUOTES, 
'UTF-8').''.htmlentities((string)((isset($in['revision']['actions']['undo']['title'])
  is_array($in['revision']['actions']['undo'])) ? 
$in['revision']['actions']['undo']['title'] : null), ENT_QUOTES, 
'UTF-8').'/a'.htmlentities((string)((isset($in['noop'])  is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').')' : '').'' : '').'/div
-'.((LCRun3::ifvar($cx, ((isset($in['links']['previous'])  
is_array($in['links'])) ? $in['links']['previous'] : null))) ? '   diva 
href='.htmlentities((string)((isset($in['links']['previous'])  
is_array($in['links'])) ? $in['links']['previous'] : null), ENT_QUOTES, 
'UTF-8').''.LCRun3::ch($cx, 'l10n', 
array(array('flow-previous-diff'),array()), 'encq').'/a/div
-' : '').''.((LCRun3::ifvar($cx, ((isset($in['links']['next'])  
is_array($in['links'])) ? $in['links']['next'] : null))) ? '  diva 
href='.htmlentities((string)((isset($in['links']['next'])  
is_array($in['links'])) ? $in['links']['next'] : null), ENT_QUOTES, 
'UTF-8').''.LCRun3::ch($cx, 'l10n', array(array('flow-next-diff'),array()), 
'encq').'/a/div
-' : '').''.LCRun3::p($cx, 'flow_patrol_diff', array(array($in),array())).'';
+'.((LCRun3::ifvar($cx, ((isset($in['links']['previous'])  
is_array($in['links'])) ? $in['links']['previous'] : null))) ? 
''.((!LCRun3::ifvar($cx, ((isset($in['new'])  is_array($in)) ? $in['new'] : 
null))) ? 'diva 
href='.htmlentities((string)((isset($in['links']['previous'])  
is_array($in['links'])) ? $in['links']['previous'] : null), ENT_QUOTES, 
'UTF-8').''.LCRun3::ch($cx, 'l10n', 
array(array('flow-previous-diff'),array()), 'encq').'/a/div' : '').'' : 
'').''.((LCRun3::ifvar($cx, ((isset($in['links']['next'])  
is_array($in['links'])) ? $in['links']['next'] : null))) ? 
''.((LCRun3::ifvar($cx, ((isset($in['new'])  is_array($in)) ? $in['new'] : 
null))) ? 'diva href='.htmlentities((string)((isset($in['links']['next']) 
 is_array($in['links'])) ? $in['links']['next'] : null), ENT_QUOTES, 
'UTF-8').''.LCRun3::ch($cx, 'l10n', array(array('flow-next-diff'),array()), 
'encq').'/a/div' : '').'' : '').''.LCRun3::p($cx, 'flow_patrol_diff', 
array(array($in),array())).'';
 }
 ?
\ No newline at end of file
diff --git a/handlebars/flow_revision_diff_header.handlebars 
b/handlebars/flow_revision_diff_header.handlebars
index df3e9d8..10a148e 100644
--- a/handlebars/flow_revision_diff_header.handlebars
+++ b/handlebars/flow_revision_diff_header.handlebars
@@ -17,9 +17,13 @@
{{~/if~}}
 /div
 {{#if links.previous}}
-   diva href={{links.previous}}{{l10n 
flow-previous-diff}}/a/div
+   {{~#unless new~}}
+   diva href={{links.previous}}{{l10n 
flow-previous-diff}}/a/div
+   {{~/unless~}}
 {{/if}}
 {{#if links.next}}
-   diva href={{links.next}}{{l10n flow-next-diff}}/a/div
+   {{~#if new~}}
+   diva href={{links.next}}{{l10n 
flow-next-diff}}/a/div
+   {{~/if~}}
 {{/if}}
 {{ flow_patrol_diff}}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85b306dab82097fd44383e2e5ea1b008b9f5964e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___

[MediaWiki-commits] [Gerrit] Only show one Older edit and one Newer edit link - change (mediawiki...Flow)

2015-07-02 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review.

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

Change subject: Only show one Older edit and one Newer edit link
..

Only show one Older edit and one Newer edit link

We were showing both links on both sides. Instead, only
show the Older link on the left and the Newer link
on the right.

Change-Id: I85b306dab82097fd44383e2e5ea1b008b9f5964e
---
M handlebars/compiled/flow_revision_diff_header.handlebars.php
M handlebars/flow_revision_diff_header.handlebars
2 files changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/56/222356/1

diff --git a/handlebars/compiled/flow_revision_diff_header.handlebars.php 
b/handlebars/compiled/flow_revision_diff_header.handlebars.php
index a33f98e..7931324 100644
--- a/handlebars/compiled/flow_revision_diff_header.handlebars.php
+++ b/handlebars/compiled/flow_revision_diff_header.handlebars.php
@@ -38,8 +38,6 @@
/a
 
 '.((LCRun3::ifvar($cx, ((isset($in['new'])  is_array($in)) ? $in['new'] : 
null))) ? ''.((LCRun3::ifvar($cx, ((isset($in['revision']['actions']['undo']) 
 is_array($in['revision']['actions'])) ? $in['revision']['actions']['undo'] : 
null))) ? '('.htmlentities((string)((isset($in['noop'])  is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'a class=mw-ui-anchor mw-ui-quiet 
href='.htmlentities((string)((isset($in['revision']['actions']['undo']['url']) 
 is_array($in['revision']['actions']['undo'])) ? 
$in['revision']['actions']['undo']['url'] : null), ENT_QUOTES, 
'UTF-8').''.htmlentities((string)((isset($in['revision']['actions']['undo']['title'])
  is_array($in['revision']['actions']['undo'])) ? 
$in['revision']['actions']['undo']['title'] : null), ENT_QUOTES, 
'UTF-8').'/a'.htmlentities((string)((isset($in['noop'])  is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').')' : '').'' : '').'/div
-'.((LCRun3::ifvar($cx, ((isset($in['links']['previous'])  
is_array($in['links'])) ? $in['links']['previous'] : null))) ? '   diva 
href='.htmlentities((string)((isset($in['links']['previous'])  
is_array($in['links'])) ? $in['links']['previous'] : null), ENT_QUOTES, 
'UTF-8').''.LCRun3::ch($cx, 'l10n', 
array(array('flow-previous-diff'),array()), 'encq').'/a/div
-' : '').''.((LCRun3::ifvar($cx, ((isset($in['links']['next'])  
is_array($in['links'])) ? $in['links']['next'] : null))) ? '  diva 
href='.htmlentities((string)((isset($in['links']['next'])  
is_array($in['links'])) ? $in['links']['next'] : null), ENT_QUOTES, 
'UTF-8').''.LCRun3::ch($cx, 'l10n', array(array('flow-next-diff'),array()), 
'encq').'/a/div
-' : '').''.LCRun3::p($cx, 'flow_patrol_diff', array(array($in),array())).'';
+'.((LCRun3::ifvar($cx, ((isset($in['links']['previous'])  
is_array($in['links'])) ? $in['links']['previous'] : null))) ? 
''.((!LCRun3::ifvar($cx, ((isset($in['new'])  is_array($in)) ? $in['new'] : 
null))) ? 'diva 
href='.htmlentities((string)((isset($in['links']['previous'])  
is_array($in['links'])) ? $in['links']['previous'] : null), ENT_QUOTES, 
'UTF-8').''.LCRun3::ch($cx, 'l10n', 
array(array('flow-previous-diff'),array()), 'encq').'/a/div' : '').'' : 
'').''.((LCRun3::ifvar($cx, ((isset($in['links']['next'])  
is_array($in['links'])) ? $in['links']['next'] : null))) ? 
''.((LCRun3::ifvar($cx, ((isset($in['new'])  is_array($in)) ? $in['new'] : 
null))) ? 'diva href='.htmlentities((string)((isset($in['links']['next']) 
 is_array($in['links'])) ? $in['links']['next'] : null), ENT_QUOTES, 
'UTF-8').''.LCRun3::ch($cx, 'l10n', array(array('flow-next-diff'),array()), 
'encq').'/a/div' : '').'' : '').''.LCRun3::p($cx, 'flow_patrol_diff', 
array(array($in),array())).'';
 }
 ?
\ No newline at end of file
diff --git a/handlebars/flow_revision_diff_header.handlebars 
b/handlebars/flow_revision_diff_header.handlebars
index df3e9d8..10a148e 100644
--- a/handlebars/flow_revision_diff_header.handlebars
+++ b/handlebars/flow_revision_diff_header.handlebars
@@ -17,9 +17,13 @@
{{~/if~}}
 /div
 {{#if links.previous}}
-   diva href={{links.previous}}{{l10n 
flow-previous-diff}}/a/div
+   {{~#unless new~}}
+   diva href={{links.previous}}{{l10n 
flow-previous-diff}}/a/div
+   {{~/unless~}}
 {{/if}}
 {{#if links.next}}
-   diva href={{links.next}}{{l10n flow-next-diff}}/a/div
+   {{~#if new~}}
+   diva href={{links.next}}{{l10n 
flow-next-diff}}/a/div
+   {{~/if~}}
 {{/if}}
 {{ flow_patrol_diff}}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85b306dab82097fd44383e2e5ea1b008b9f5964e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com

___
MediaWiki-commits mailing list