summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2012-07-03 11:12:11 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2012-07-03 11:12:11 +0200
commit9b1195430a2dc636e8325ecbb7445855d9d98259 (patch)
tree4a7a03c5cc939cde1c4017426d3a3a0262399b9d /views
parent2aba868b67edc249774d1f9b9a5fd4c497383623 (diff)
downloadcollection-json-explorer-9b1195430a2dc636e8325ecbb7445855d9d98259.tar.gz
collection-json-explorer-9b1195430a2dc636e8325ecbb7445855d9d98259.tar.bz2
collection-json-explorer-9b1195430a2dc636e8325ecbb7445855d9d98259.tar.xz
collection-json-explorer-9b1195430a2dc636e8325ecbb7445855d9d98259.zip
o Updating error rendering after adding sidebar.
o Showing raw data when rendering errors too.
Diffstat (limited to 'views')
-rw-r--r--views/data.jade52
1 files changed, 27 insertions, 25 deletions
diff --git a/views/data.jade b/views/data.jade
index 5c93aef..9f64ddf 100644
--- a/views/data.jade
+++ b/views/data.jade
@@ -127,7 +127,6 @@ block queries
div(class='control-group')
div(class='controls')
input(type='submit') Execute
- // button(class='execute-query') Execute
block headers
pre
@@ -137,12 +136,6 @@ block headers
td #{key}:
td #{value}
-block formatted_body
- pre= formattedBody
-
-block raw_body
- pre= rawBody
-
block navbar
div(class='navbar navbar-fixed-top')
div(class='navbar-inner')
@@ -169,29 +162,37 @@ block navbar
block sidebar
div(id='navbar', class='sidebar-nav sidebar-nav-fixed')
ul(class='nav nav-list')
- li(class='nav-header'): a(href='#meta') Meta
- each link, i in collection.links
- li: a(href='#link-' + (i + 1))
- mixin get_name(link, 'Link', i)
- li(class='nav-header'): a(href='#items') Items
- each item, i in collection.items
- li: a(href='#item-' + (i + 1)) ##{i + 1}
- li(class='nav-header'): a(href='#queries') Queries
- each query, i in collection.queries
- li: a(href='#query-' + (i + 1))
- mixin get_name(query, 'Query', i)
- li(class='nav-header'): a(href='#headers') Headers
- li(class='nav-header'): a(href='#formatted-body') Formatted Body
- li(class='nav-header'): a(href='#raw-body') Raw Body
+ if typeof err != 'undefined'
+ li(class='nav-header'): a(href='#error') Error
+ li(class='nav-header'): a(href='#raw-body') Raw Body
+ else
+ li(class='nav-header'): a(href='#meta') Meta
+ each link, i in collection.links
+ li: a(href='#link-' + (i + 1))
+ mixin get_name(link, 'Link', i)
+ li(class='nav-header'): a(href='#items') Items
+ each item, i in collection.items
+ li: a(href='#item-' + (i + 1)) ##{i + 1}
+ li(class='nav-header'): a(href='#queries') Queries
+ each query, i in collection.queries
+ li: a(href='#query-' + (i + 1))
+ mixin get_name(query, 'Query', i)
+ li(class='nav-header'): a(href='#headers') Headers
+ li(class='nav-header'): a(href='#formatted-body') Formatted Body
+ li(class='nav-header'): a(href='#raw-body') Raw Body
block inner_content
if typeof err != 'undefined'
section(id='error')
div(class='page-error')
h1 Error
- p Error rendering #{url}
+ p Error rendering #{url}
- p= err
+ p= err
+ section(id='raw-body')
+ div(class='page-header')
+ h1 Raw Body
+ pre= rawBody
else
section(id='meta')
div(class='page-header')
@@ -214,15 +215,16 @@ block inner_content
section(id='formatted-body')
div(class='page-header')
h1 Formatted Body
- block formatted_body
+ pre= formattedBody
section(id='raw-body')
div(class='page-header')
h1 Raw Body
- block raw_body
+ pre= rawBody
block content
div(class='row-fluid')
div(class='span3')
block sidebar
div(class='span9')
+ - console.log('fuck')
block inner_content