Merge pull request #3835 from Imperadeiro98/master

Remove obsolete ErrorView from templates
This commit is contained in:
Scott Erickson 2016-08-11 08:30:42 -07:00 committed by GitHub
commit 37d0b23103
4 changed files with 14 additions and 20 deletions

View file

@ -26,5 +26,3 @@ block content
.patches-view
hr
div#error-view

View file

@ -8,14 +8,14 @@ block header
li
a(href="/editor/level")
span.glyphicon-home.glyphicon
else
nav.navbar.navbar-default(role='navigation')#level-editor-top-nav
ul.nav.navbar-nav
li
a(href="/editor/level")
span.glyphicon-home.glyphicon
ul.nav.navbar-nav.nav-tabs
li.active
a(href="#thangs-tab-view", data-toggle="tab", data-i18n="editor.level_tab_thangs") Thangs
@ -75,7 +75,7 @@ block header
a.play-with-team-button(data-team=team)= team + ' vs. AI'
for match in recentlyPlayedOpponents
a.play-with-team-button(data-team=match.yourTeam, data-opponent=match.opponentSessionID)= match.yourTeam + ' vs. ' + match.opponentName
else
li(data-i18n="[title]general.play_preview", title="Play preview of current level")#play-button
a
@ -93,7 +93,7 @@ block header
span.unwatch.secret
span.glyphicon.glyphicon-eye-close
span.spl(data-i18n="common.unwatch") Unwatch
li(class=anonymous ? "disabled": "")
a(data-i18n="common.fork")#fork-start-button Fork
li(class=anonymous ? "disabled": "")
@ -126,9 +126,9 @@ block outer_content
.outer-content
div.tab-content#level-editor-tabs
div.tab-pane.active#thangs-tab-view
div.tab-pane#editor-level-scripts-tab-view
div.tab-pane#editor-level-settings-tab-view
div.tab-pane#editor-level-components-tab-view
@ -136,7 +136,7 @@ block outer_content
div.tab-pane#systems-tab-view
div.tab-pane#editor-level-tasks-tab-view
div.tab-pane#editor-level-patches.nano
.nano-content
.patches-view
@ -155,6 +155,4 @@ block outer_content
div.tab-pane#level-feedback-view
div#error-view
block footer

View file

@ -42,7 +42,7 @@ block header
for level in recentlyPlayedLevels
a.play-with-level-button(data-level=level)= level
input.play-with-level-input(placeholder="Type in a level name")
if authorized
li#save-button
a
@ -138,6 +138,5 @@ block outer_content
div#spritesheets
div.tab-pane#editor-thang-patches-view
div.patches-view
div#error-view
.clearfix
block footer

View file

@ -8,7 +8,7 @@ block header
li
a(href="/i18n")
span.glyphicon-home.glyphicon
else
nav.navbar.navbar-default(role='navigation')
ul.nav.navbar-nav
@ -24,16 +24,16 @@ block header
button.btn.btn-info.btn-sm.pull-right#patch-submit(disabled=model.hasLocalChanges() ? null : 'disabled', value=model.id, data-i18n="common.submit_changes") Submit Changes
li.dropdown
a(data-toggle='dropdown')
span.glyphicon-chevron-down.glyphicon
ul.dropdown-menu
li.dropdown-header(data-i18n="common.actions") Actions
li(class=anonymous ? "disabled": "")
a(data-toggle="coco-modal", data-target="modal/RevertModal", data-i18n="editor.revert")#revert-button Revert
li.divider
li.dropdown-header(data-i18n="common.info") Info
li#history-button
@ -51,7 +51,7 @@ block header
block outer_content
.outer-content
select.form-control#language-select
for row in translationList
@ -68,6 +68,5 @@ block outer_content
else
input.input-sm.form-control.translation-input(data-index=row.index.toString(), value=row.toValue)
div#error-view
.clearfix
block footer