Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal

This commit is contained in:
Nick Winter 2014-03-10 11:29:47 -07:00
commit 77f7276759
7 changed files with 72 additions and 15 deletions

View file

@ -271,6 +271,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
body: "Body"
version: "Version"
commit_msg: "Commit Message"
version_history: "Version History"
version_history_for: "Version History for: "
results: "Results"
description: "Description"

View file

@ -265,6 +265,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
body: "Inhoud"
version: "Versie"
commit_msg: "Commit Bericht"
version_history: "Versie geschiedenis"
version_history_for: "Versie geschiedenis voor: "
results: "Resultaten"
description: "Beschrijving"

View file

@ -38,9 +38,11 @@ block outer_content
li.dropdown
a.dropdown-toggle(href='#', data-toggle='dropdown')
| Help
| More
b.caret
ul.dropdown-menu
li#version-history-button
a(href='#') Version History
li
a(href='https://github.com/codecombat/codecombat/wiki/Artisan-Home') Wiki
li

View file

@ -0,0 +1,11 @@
extends /templates/modal/modal_base
include /templates/kinds/versions
block modal-header-content
h3(data-i18n="general.version_history") Version History
block modal-body-content
if dataList
+version-history-body()
block modal-footer-content

View file

@ -1,19 +1,24 @@
extends /templates/base
mixin version-history-title()
h3(data-i18n="general.version_history_for") Version History for: #{dataList[0]}
mixin version-history-body()
table.table
tr
th(data-i18n="general.name") Name
th(data-i18n="general.version") Version
th(data-i18n="general.commit_msg") Commit Message
for data in dataList
tr
td
a(href="/editor/#{page}/#{data.slug || data._id}")
| #{data.name}
td #{data.version.major}.#{data.version.minor}
td #{data.commitMessage}
block content
if dataList
h3(data-i18n="general.version_history_for") Version History for: "#{dataList[0].name}"
+version-history-title()
table.table
tr
th(data-i18n="general.name") Name
th(data-i18n="general.version") Version
th(data-i18n="general.commit_msg") Commit Message
for data in dataList
tr
td
a(href="/editor/#{page}/#{data.slug || data._id}")
| #{data.name}
td #{data.version.major}.#{data.version.minor}
td #{data.commitMessage}
+version-history-body()

View file

@ -12,6 +12,7 @@ ComponentsTabView = require './components_tab_view'
SystemsTabView = require './systems_tab_view'
LevelSaveView = require './save_view'
LevelForkView = require './fork_view'
VersionHistoryView = require './versions_view'
module.exports = class EditorLevelView extends View
id: "editor-level-view"
@ -23,6 +24,7 @@ module.exports = class EditorLevelView extends View
'click #play-button': 'onPlayLevel'
'click #commit-level-start-button': 'startCommittingLevel'
'click #fork-level-start-button': 'startForkingLevel'
'click #version-history-button': 'showVersionHistory'
constructor: (options, @levelID) ->
super options
@ -102,3 +104,8 @@ module.exports = class EditorLevelView extends View
levelForkView = new LevelForkView level: @level
@openModalView levelForkView
Backbone.Mediator.publish 'level:view-switched', e
showVersionHistory: (e) ->
versionHistoryView = new VersionHistoryView level:@level, @levelID
@openModalView versionHistoryView
Backbone.Mediator.publish 'level:view-switched', e

View file

@ -0,0 +1,30 @@
VersionsView = require 'views/kinds/VersionsView'
ModalView = require 'views/kinds/ModalView'
template = require 'templates/editor/level/versions'
module.exports = class ModalVersionsView extends VersionsView
id: 'version-history-modal'
url: "/db/level/"
page: "level"
template: template
className: "modal fade"
closeButton: true
closesOnClickOutside: true
modalWidthPercent: null
shortcuts:
'esc': 'hide'
constructor: (options, @ID) ->
super options, ID, require 'models/Level'
_.extend @, ModalView
ModalView.prototype.constructor options
getRenderData: (context={}) ->
context = super(context)
context.closeButton = true
context
hide: ->
@$el.removeClass('fade').modal "hide"