Merge remote-tracking branch 'origin/dataset-ui' into develop

Conflicts:
	lib/dashboard/dashboard-view.co
	lib/graph/graph-display-view.co
	lib/graph/graph-edit-view.co
	lib/server/controllers/graph.co
	lib/server/server.co
	lib/template/graph-display.jade

diff --cc lib/graph/graph-display-view.co
index 8b535fe,e698d7b..9ccc38e
--- 1/lib/graph/graph-display-view.co
--- 2/lib/graph/graph-display-view.co
+++ b/lib/graph/graph-display-view.co
@@@ -34,13 -34,14 +34,14 @@@ GraphDisplayView = exports.GraphDisplay
      
      events:
          # Select the whole permalink URI text when it receives focus.
-         'focus      .graph-permalink input'             : 'onPermalinkFocus'     
-         'click      .export-button'                     : 'exportChart'
-         #     'click    .load-button'                    : 'load'
- 
 -        'focus      .graph-permalink input'             : 'onPermalinkFocus'
 -        #     'click    .redraw-button'                  : 'stopAndRender'
 -        #     'click    .load-button'                    : 'load'
++        'focus      .graph-permalink input' : 'onPermalinkFocus'
++        'click      .export-button'         : 'exportChart'
++        # 'click      .load-button'           : 'load'
+     
      data  : {}
      ready : false
- 
+     
+     
      constructor: function GraphDisplayView
          BaseView ...
      
@@@ -122,13 -123,13 +123,13 @@@
          return { width, height } unless @ready
          
          # Remove old style, as it confuses dygraph after options update
-         viewport = @$el.find '.viewport'
+         viewport = @$ '.viewport'
          viewport.attr 'style', ''
-         label = @$el.find '.graph-legend'
+         label = @$ '.graph-legend'
          
          if width is 'auto'
 -            vpWidth = viewport.innerWidth()
 -            labelW = label.outerWidth()
 +            vpWidth = viewport.innerWidth() or 300
 +            labelW = label.outerWidth() or 228
              width = vpWidth - labelW - 10 - (vpWidth - label.position().left - labelW)
          width ?= modelW
          if height is 'auto'
@@@ -287,10 -268,8 +287,10 @@@
          # last action that happens.  If we don't
          # defer, the focusing click will 
          # unselect the text.
-         _.defer( ~> @$el.find '.graph-permalink input' .select() )
+         _.defer( ~> @$ '.graph-permalink input' .select() )
  
 +
 +
      # Needed because (sigh) _.debounce returns undefined
      stopAndRender: ->
          @render ...

diff --cc lib/graph/graph-edit-view.co
index f41f033,d641591..37b44a8
--- 1/lib/graph/graph-edit-view.co
--- 2/lib/graph/graph-edit-view.co
+++ b/lib/graph/graph-edit-view.co
@@@ -163,17 -210,19 +210,19 @@@ GraphEditView = exports.GraphEditView 
          modelH = height = @model.get 'height'
          return { width, height } unless @ready
          
+         viewport = @$ '.viewport'
+         
          # Remove old style, as it confuses dygraph after options update
-         @viewport.attr 'style', ''
-         label = @$el.find '.graph-label'
+         viewport.attr 'style', ''
+         label = @$ '.graph-label'
          
          if width is 'auto'
-             vpWidth = @viewport.innerWidth() or 300
 -            vpWidth = viewport.innerWidth()
 -            labelW = label.outerWidth()
++            vpWidth = viewport.innerWidth() or 300
 +            labelW = label.outerWidth() or 228
              width = vpWidth - labelW - 10 - (vpWidth - label.position().left - labelW)
          width ?= modelW
          if height is 'auto'
-             height = @viewport.innerHeight() or 320
 -            height = viewport.innerHeight()
++            height = viewport.innerHeight() or 320
          height ?= modelH
          
          size = { width, height }

diff --cc lib/server/controllers/graph.co
index 91efa70,3912f74..b399ad6
--- 1/lib/server/controllers/graph.co
--- 2/lib/server/controllers/graph.co
+++ b/lib/server/controllers/graph.co
@@@ -1,14 -1,11 +1,15 @@@
- _        = require 'underscore'
- fs       = require 'fs'
- path     = require 'path'
- yaml     = require 'js-yaml'
- Seq      = require 'seq'
- 
+ fs         = require 'fs'
+ path       = require 'path'
  {existsSync:exists} = path
+ 
+ _          = require 'underscore'
++Seq        = require 'seq'
+ yaml       = require 'js-yaml'
  {mkdirp, mkdirpAsync} = require '../mkdirp'
+ 
 +{ readJSONFilesAsync,
 +} = require '../files'
 +
  Controller = require '../controller'
  
  

diff --cc lib/server/server.co
index bf087a2,0c0ae51..3dfc9ad
--- 1/lib/server/server.co
--- 2/lib/server/server.co
+++ b/lib/server/server.co
@@@ -177,12 -184,14 +176,17 @@@ app.get '/datasources/all', (req, res, 
              console.error that if err.stack
              res.send { error:String(err), partial_data:data }
  
+ app.controller require './controllers/datasource'
+ 
+ 
  app.get '/', (req, res) ->
-     res.render 'dashboard'
+     ### XXX: Temporary, while I implement backwards compat with the old data format
+     # res.render 'dashboard'
+     res.redirect '/graphs/ohai/edit'
  
 +app.get '/geo', (req, res) ->
 +    res.render 'geo'
 +
  app.get '/:type/:action/?', (req, res, next) ->
      {type, action} = req.params
      if exists "#WWW/#type/#action.jade"

diff --cc lib/template/dashboard.jade
index f8adfc1,3688666..70b991e
--- 1/lib/template/dashboard.jade
--- 2/lib/template/dashboard.jade
+++ b/lib/template/dashboard.jade
@@@ -1,22 -1,7 +1,22 @@@
- section#graph-list
+ section#dashboard
      .page-header
 -        h1 Wikimedia Report Card 
 -            small February 2012
 +        h1 Wikimedia Report Card
 +            small March 2012
      
 -    section#graphs
 +    .row
 +        .graphs.tabbable
 +            nav
 +                ul.nav.subnav.nav-pills
 +                    li:         h3 Graphs
 +                    li.active:  a(href="#core-graphs", data-toggle="tab") Core
 +                    li:         a(href="#other-graphs", data-toggle="tab") Others
 +                    if ENV == 'dev'
 +                        li:     a(href="#dev-graphs", data-toggle="tab") Dev
 +                    
 +            .tab-content
 +                .core-graphs-pane.tab-pane.active(id="core-graphs")
 +                .other-graphs-pane.tab-pane(id="other-graphs")
 +                if ENV == 'dev'
 +                    .dev-graphs-pane.tab-pane(id="dev-graphs")
 +
  

diff --cc lib/template/graph-display.jade
index 61d43ec,200e41a..9906e6e
--- 1/lib/template/graph-display.jade
--- 2/lib/template/graph-display.jade
+++ b/lib/template/graph-display.jade
@@@ -1,30 -1,23 +1,29 @@@
  include browser-helpers
  - var graph_id = view.id
- section.graph-display.graph(id=view.id)
-         
+ section.graph-display.graph(id=graph_id)
+     
      .graph-name-row.page-header.row-fluid
--        h2.graph-name 
++        h2.graph-name
              a(id="graph-title", href="#{model.toLink()}") #{name}
      
      .graph-viewport-row.row-fluid
          .viewport
          .graph-legend
      
 -    .graph-details-row.row-fluid
 -        .graph-desc.span6
 +    .graph-details-row.row
 +        .span7.offset1.graph-desc
-                 != jade.filters.markdown(desc)
- 
+             != jade.filters.markdown(desc)
 -        
 -        .span8
 -            .graph-permalink 
 -                input.span6(value="#{model.toPermalink()}", readonly="readonly")
 -            
 -            .graph-notes
 -                != jade.filters.markdown(notes)
 -            
++    
 +    .graph-details-row.row
-         .span6.offset1.graph-permalink 
-                 input.span6(value="#{model.toPermalink()}", readonly="readonly")
++        .span6.offset1.graph-permalink
++            input.span6(value="#{model.toPermalink()}", readonly="readonly")
 +        if ENV == 'dev'
 +            .span1.a.export-button.btn(href="#")
 +                i.icon-file
 +                |  Export
- 
++    
 +    .graph-details-row.row
 +        .span6.offset1.graph-notes
-             != jade.filters.markdown(notes)        
-         
- 
++            != jade.filters.markdown(notes)
++    
 +

diff --cc www/layout.jade
Simple merge

diff --cc www/modules.yaml
Simple merge