From 4a16deb50d11328b5ffde058e391813894b3886b Mon Sep 17 00:00:00 2001 From: Negue Date: Thu, 29 Jan 2015 18:16:33 +0100 Subject: [PATCH 1/2] aLink mixin to handle mobile links --- views/shared/profiles/achievements.jade | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/views/shared/profiles/achievements.jade b/views/shared/profiles/achievements.jade index af414f15b5..9879848f0f 100644 --- a/views/shared/profiles/achievements.jade +++ b/views/shared/profiles/achievements.jade @@ -11,6 +11,12 @@ //
//
+mixin aLink(url, label) + if mobile + a(href="", ng-click="externalLink('#{url}')")= label + else + a(href='#{url}', target='_blank')= label + if mobile .item.item-divider=env.t('achievements') @@ -32,7 +38,7 @@ div(ng-if='::profile.contributor.level || user._id == profile._id') small =env.t('contribText') |  - a(href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG', target='_blank')=env.t('readMore') + +aLink('http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG', env.t('readMore')) | . hr @@ -75,7 +81,8 @@ div(ng-if='profile.achievements.perfect || user._id == profile._id') div(ng-if='::user._id == profile._id') div.muted h5=env.t('ultimGearName') - small Returning soon + small + +aLink('https://github.com/HabitRPG/habitrpg/issues/2232', 'Returning soon') hr div(ng-if='profile.achievements.beastMaster || user._id == profile._id') @@ -121,7 +128,7 @@ div(ng-if='::profile.achievements.helpedHabit') small =env.t('helpedText1') |  - a(href='http://community.habitrpg.com/node/290', target='_blank')=env.t('helpedText2') + +aLink('http://community.habitrpg.com/node/290', env.t('helpedText2')) hr div(ng-if=':: profile.achievements.originalUser || profile.achievements.veteran') From e165f5dac4a13a38bec4d16104d365265f53d356 Mon Sep 17 00:00:00 2001 From: Negue Date: Thu, 29 Jan 2015 20:40:06 +0100 Subject: [PATCH 2/2] move aLink to mixins.jade --- views/shared/mixins.jade | 6 ++++++ views/shared/profiles/achievements.jade | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/views/shared/mixins.jade b/views/shared/mixins.jade index 9fd46f2273..722fe51259 100644 --- a/views/shared/mixins.jade +++ b/views/shared/mixins.jade @@ -6,3 +6,9 @@ mixin gemButton(isGemsModal) .Pet_Currency_Gem2x.Gems | {{user.balance * 4 | number:0}} =env.t('gems') + +mixin aLink(url, label) + if mobile + a(href="", ng-click="externalLink('#{url}')")= label + else + a(href='#{url}', target='_blank')= label \ No newline at end of file diff --git a/views/shared/profiles/achievements.jade b/views/shared/profiles/achievements.jade index 9879848f0f..e2c1d052ec 100644 --- a/views/shared/profiles/achievements.jade +++ b/views/shared/profiles/achievements.jade @@ -11,12 +11,6 @@ //
//
-mixin aLink(url, label) - if mobile - a(href="", ng-click="externalLink('#{url}')")= label - else - a(href='#{url}', target='_blank')= label - if mobile .item.item-divider=env.t('achievements')