From e07d2561bd5f1150121c38b9945714f83ec3eded Mon Sep 17 00:00:00 2001 From: Maikel Langezaal Date: Fri, 11 Mar 2016 21:01:06 +0100 Subject: [PATCH 1/4] Made the treema visible to be build, but disabled and hidden the buttons --- app/templates/editor/achievement/edit.jade | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/app/templates/editor/achievement/edit.jade b/app/templates/editor/achievement/edit.jade index 4ff2065a0..65ebc3677 100644 --- a/app/templates/editor/achievement/edit.jade +++ b/app/templates/editor/achievement/edit.jade @@ -30,5 +30,28 @@ block content hr else - .alert.alert-danger - span Admin only. Turn around. + ol.breadcrumb + li + a(href="/editor", data-i18n="editor.main_title") CodeCombat Editors + li + a(href="/editor/achievement", data-i18n="editor.achievement_title") Achievement Editor + li.active + | #{view.achievement.attributes.name} + + button.achievement-tool-button(data-i18n="", disabled=true, style="display:none;").btn.btn-primary#recalculate-all-button Recalculate All + button.achievement-tool-button(data-i18n="", disabled=true, style="display:none;").btn.btn-primary#recalculate-button Recalculate + button.achievement-tool-button(data-i18n="common.delete", disabled=true, style="display:none;").btn.btn-primary#delete-button Delete + button.achievement-tool-button(data-i18n="common.save", disabled=true, style="display:none;").btn.btn-primary#save-button Save + + h3(data-i18n="achievement.edit_achievement_title") Edit Achievement + span + |: "#{view.achievement.attributes.name}" + + #achievement-treema + + #achievement-view.clearfix + + h3(data-i18n="resources.patches") Patches + .patches-view + + hr From 5aff988ec532f0c519639d1718695a438da23972 Mon Sep 17 00:00:00 2001 From: Maikel Langezaal Date: Fri, 11 Mar 2016 21:08:13 +0100 Subject: [PATCH 2/4] Cleaned up code --- app/templates/editor/achievement/edit.jade | 41 ++++++---------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/app/templates/editor/achievement/edit.jade b/app/templates/editor/achievement/edit.jade index 65ebc3677..d31d171b8 100644 --- a/app/templates/editor/achievement/edit.jade +++ b/app/templates/editor/achievement/edit.jade @@ -2,8 +2,7 @@ extends /templates/base block content - var authorized = me.isAdmin() || me.isArtisan(); - if authorized - ol.breadcrumb + ol.breadcrumb li a(href="/editor", data-i18n="editor.main_title") CodeCombat Editors li @@ -11,47 +10,27 @@ block content li.active | #{view.achievement.attributes.name} + if authorized button.achievement-tool-button(data-i18n="", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#recalculate-all-button Recalculate All button.achievement-tool-button(data-i18n="", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#recalculate-button Recalculate button.achievement-tool-button(data-i18n="common.delete", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#delete-button Delete button.achievement-tool-button(data-i18n="common.save", disabled=(me.isAdmin() === true || me.isArtisan() === true) ? undefined : "true").btn.btn-primary#save-button Save - h3(data-i18n="achievement.edit_achievement_title") Edit Achievement - span - |: "#{view.achievement.attributes.name}" - - #achievement-treema - - #achievement-view.clearfix - - h3(data-i18n="resources.patches") Patches - .patches-view - - hr - else - ol.breadcrumb - li - a(href="/editor", data-i18n="editor.main_title") CodeCombat Editors - li - a(href="/editor/achievement", data-i18n="editor.achievement_title") Achievement Editor - li.active - | #{view.achievement.attributes.name} - button.achievement-tool-button(data-i18n="", disabled=true, style="display:none;").btn.btn-primary#recalculate-all-button Recalculate All button.achievement-tool-button(data-i18n="", disabled=true, style="display:none;").btn.btn-primary#recalculate-button Recalculate button.achievement-tool-button(data-i18n="common.delete", disabled=true, style="display:none;").btn.btn-primary#delete-button Delete button.achievement-tool-button(data-i18n="common.save", disabled=true, style="display:none;").btn.btn-primary#save-button Save - h3(data-i18n="achievement.edit_achievement_title") Edit Achievement - span - |: "#{view.achievement.attributes.name}" + h3(data-i18n="achievement.edit_achievement_title") Edit Achievement + span + |: "#{view.achievement.attributes.name}" - #achievement-treema + #achievement-treema - #achievement-view.clearfix + #achievement-view.clearfix - h3(data-i18n="resources.patches") Patches - .patches-view + h3(data-i18n="resources.patches") Patches + .patches-view - hr + hr From 49d7028e2e34ee466f2f1f267afd3b2a910df09a Mon Sep 17 00:00:00 2001 From: Maikel Langezaal Date: Thu, 17 Mar 2016 11:30:19 +0100 Subject: [PATCH 3/4] Cleanup --- app/templates/editor/achievement/edit.jade | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/templates/editor/achievement/edit.jade b/app/templates/editor/achievement/edit.jade index d31d171b8..251f21f4a 100644 --- a/app/templates/editor/achievement/edit.jade +++ b/app/templates/editor/achievement/edit.jade @@ -16,15 +16,9 @@ block content button.achievement-tool-button(data-i18n="common.delete", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#delete-button Delete button.achievement-tool-button(data-i18n="common.save", disabled=(me.isAdmin() === true || me.isArtisan() === true) ? undefined : "true").btn.btn-primary#save-button Save - else - button.achievement-tool-button(data-i18n="", disabled=true, style="display:none;").btn.btn-primary#recalculate-all-button Recalculate All - button.achievement-tool-button(data-i18n="", disabled=true, style="display:none;").btn.btn-primary#recalculate-button Recalculate - button.achievement-tool-button(data-i18n="common.delete", disabled=true, style="display:none;").btn.btn-primary#delete-button Delete - button.achievement-tool-button(data-i18n="common.save", disabled=true, style="display:none;").btn.btn-primary#save-button Save - h3(data-i18n="achievement.edit_achievement_title") Edit Achievement span - |: "#{view.achievement.attributes.name}" + |: "#{view.achievement.get('name')}" #achievement-treema From 3be8220e0aac54a719ccc3cbd28fc4774685ebf0 Mon Sep 17 00:00:00 2001 From: Maikel Langezaal Date: Thu, 24 Mar 2016 14:10:09 +0100 Subject: [PATCH 4/4] read only message --- app/views/editor/achievement/AchievementEditView.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/editor/achievement/AchievementEditView.coffee b/app/views/editor/achievement/AchievementEditView.coffee index e39cceaa4..5295f0aa9 100644 --- a/app/views/editor/achievement/AchievementEditView.coffee +++ b/app/views/editor/achievement/AchievementEditView.coffee @@ -54,6 +54,7 @@ module.exports = class AchievementEditView extends RootView afterRender: -> super() return unless @supermodel.finished() + @showReadOnly() if me.get('anonymous') @pushChangesToPreview() @patchesView = @insertSubView(new PatchesView(@achievement), @$el.find('.patches-view')) @patchesView.load()