build symlinks during npm postinstall

diff --git a/.gitignore b/.gitignore
index d2ffaf1..58e49af 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,6 @@ test/lib/demo-test.backup
 test/lib/login_data.js*
 test/mocha/lib/demo-test.backup
 install.log
+enyo-client/application/lib
+enyo-client/application/enyo
+lib/module

diff --git a/.gitmodules b/.gitmodules
index 42d04d7..c14a883 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "enyo-client/application/enyo"]
-  path = enyo-client/application/enyo
-  url = https://github.com/xtuple/enyo.git
 [submodule "lib/onyx"]
   path = lib/onyx
   url = https://github.com/enyojs/onyx.git

diff --git a/enyo-client/application/lib b/enyo-client/application/lib
new file mode 120000 (symlink)
index 0000000..58677dd
--- /dev/null
+++ b/enyo-client/application/lib
@@ -0,0 +1 @@
+../../lib
\ No newline at end of file

diff --git a/enyo-client/application/source/ext/package.js b/enyo-client/application/source/ext/package.js
index dd84a38..9baa8cb 100644 (file)
--- a/enyo-client/application/source/ext/package.js
+++ b/enyo-client/application/source/ext/package.js
@@ -1,5 +1,5 @@
 enyo.depends(
-  "../../../../node_modules/rjson/rjson.js",
+  "../../lib/module/rjson/rjson.js",
   "core.js",
   "datasource.js",
   "session.js"

diff --git a/enyo-client/application/source/package.js b/enyo-client/application/source/package.js
index af3ac8b..f84ee3a 100644 (file)
--- a/enyo-client/application/source/package.js
+++ b/enyo-client/application/source/package.js
@@ -1,8 +1,8 @@
 enyo.depends(
   "preliminaries.js",
-  "../../../lib/tools",
-  "../../../lib/backbone-x",
-  "../../../lib/enyo-x",
+  "../lib/tools",
+  "../lib/backbone-x",
+  "../lib/enyo-x",
   "ext",
   "models",
   "widgets",

diff --git a/enyo-client/application/tools/deploy.sh b/enyo-client/application/tools/deploy.sh
index 157619a..bafab61 100755 (executable)
--- a/enyo-client/application/tools/deploy.sh
+++ b/enyo-client/application/tools/deploy.sh
@@ -9,7 +9,8 @@ FOLDER=deploy
 SUFFIX=`date "+-%Y_%m_%d-%I_%M_%S%p"`
 
 # The grandparent folder for this script
-SOURCE=$(pwd)/..
+SOURCE=$(cd `dirname $0`/../; pwd)
+#ln -s $SOURCE/lib $SOURCE/../../../lib
 
 # extract project folder name
 NAME=${SOURCE##*/}
@@ -48,7 +49,7 @@ mkdir -p "$TARGET/lib"
 # copy assets and build
 cp -r "$SOURCE/../../node-datasource/views/login/assets" "$SOURCE/build" "$TARGET"
 
-for i in "$SOURCE/../../lib/"*; do
+for i in "$SOURCE/lib/"*; do
        o=${i##*/}
        if [ -x $i/deploy.sh ]; then
                echo "Deploying $o"

diff --git a/enyo-client/application/tools/minify.sh b/enyo-client/application/tools/minify.sh
index 2778144..598eb25 100755 (executable)
--- a/enyo-client/application/tools/minify.sh
+++ b/enyo-client/application/tools/minify.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
 
 cd `dirname $0`
-PWD=$(pwd)
 
 # build enyo
-pushd ../../../
-./lib/enyo-x/enyo/tools/deploy.js -p lib/enyo-x/enyo/source/package.js -b enyo-client/application/build
-popd
+pushd ../enyo/minify > /dev/null
+./minify.sh
+popd > /dev/null
 
 # build app
-../../../lib/enyo-x/enyo/tools/minify.sh package.js -output ../build/app
+../enyo/tools/minify.sh package.js -output ../build/app

diff --git a/lib/enyo-x/lib/package.js b/lib/enyo-x/lib/package.js
index 93c5e41..3fbaedb 100644 (file)
--- a/lib/enyo-x/lib/package.js
+++ b/lib/enyo-x/lib/package.js
@@ -1,9 +1,9 @@
 enyo.depends(
   "date_format/date_format.js",
   "gts-plugins/DatePicker",
-  "../../../node_modules/nvd3/lib/d3.v3.js",
-  "../../../node_modules/nvd3/nv.d3.min.js",
-  "../../../node_modules/font-onyx/lib/Icon.js",
-  "../../../node_modules/font-onyx/lib/IconButton.js",
-  "../../../node_modules/font-onyx/lib/TextIcon.js"
+  "../../module/nvd3/lib/d3.v3.js",
+  "../../module/nvd3/nv.d3.min.js",
+  "../../module/font-onyx/lib/Icon.js",
+  "../../module/font-onyx/lib/IconButton.js",
+  "../../module/font-onyx/lib/TextIcon.js"
 );

diff --git a/lib/enyo-x/source/stylesheets/screen.css b/lib/enyo-x/source/stylesheets/screen.css
old mode 100755 (executable)
new mode 100644 (file)
index 992a775..7bc1919
--- a/lib/enyo-x/source/stylesheets/screen.css
+++ b/lib/enyo-x/source/stylesheets/screen.css
@@ -1527,9 +1527,9 @@ body {
   /* Setting this as min-width overrides enyo-narrow 100% */
   width: 320px;
   background-color: #fdfdfd;
-  -webkit-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0.2);
-  box-shadow: -2px -2px 6px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0);
+  -moz-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0);
+  box-shadow: -2px -2px 6px rgba(0, 0, 0, 0);
 }
 /*
   Media query for responsive design. This adapts to smaller
@@ -1870,9 +1870,9 @@ body {
 }
 .xv-workspace-container {
   background: #fdfdfd;
-  -webkit-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0.2);
-  box-shadow: -2px -2px 6px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0);
+  -moz-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0);
+  box-shadow: -2px -2px 6px rgba(0, 0, 0, 0);
 }
 .xv-workspace-container .xv-content-panel .xv-header {
   background-color: #fdfdfd;
@@ -1995,781 +1995,781 @@ body {
   border: none;
 }
 /**
- * Default ListItem styles when using a ModelDecorator.
- */
-.xv-list .xv-model-decorator > .xv-list-item .xv-table {
-  display: table;
-  width: 100%;
-  table-layout: fixed;
-}
-.xv-list .xv-model-decorator > .xv-list-item .xv-table .xv-cell {
-  display: table-cell;
-}
-.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr {
-  /**
-        * Default styling for a model's id (as designated by 'idAttribute')
-        */
-}
-.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr.xm-attribute-id {
-  color: blue;
+  Styles relating to Lists
+*/
+.xv-list-header {
+  background-color: #d8d8d8;
+  color: #fdfdfd;
+  font-size: .6em;
   font-weight: bold;
-  cursor: pointer;
+  text-transform: uppercase;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  border-bottom: 1px solid #aaaaaa;
 }
-.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr.xm-attribute-name {
-  font-weight: bold;
+.xv-list-header .xv-list-column.last {
+  border-right: none;
 }
-.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr.xm-attributetype-number {
-  text-align: right;
+.xv-list-header .xv-list-column.name-column,
+.xv-list-header .xv-list-column.first,
+.xv-list-header .xv-list-column.second,
+.xv-list-header .xv-list-column.third,
+.xv-list-header .xv-list-column.short,
+.xv-list-header .xv-list-column.small,
+.xv-list-header .xv-list-column.medium,
+.xv-list-header .xv-list-column.descr {
+  padding-left: 7px;
 }
-.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr.xm-attributetype-money {
+/* List */
+.xv-list-column.line-number {
+  width: 30px;
   text-align: right;
 }
-.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr.xm-attributetype-date {
+.xv-list-column.name-column {
+  width: 200px;
+}
+.xv-list-column.right-column {
+  width: 100px;
   text-align: right;
 }
-.xv-list .xv-model-decorator > .xv-list-item.item-selected .xv-list-attr {
-  color: white;
+.xv-list-column.short {
+  width: 100px;
 }
-.xv-list .xv-model-decorator > .xv-list-item.item-selected .xv-list-attr.xm-attribute-id {
-  color: #ff6529;
+.xv-list-column.small {
+  width: 125px;
 }
-/**
-  Styles related to pickers, combo boxes, and relation widgets
-*/
-.onyx-picker-decorator .onyx-button {
-  padding: 12px 8px 12px 8px;
+.xv-list-column.medium {
   width: 150px;
 }
-.onyx-picker .onyx-menu-item {
-  text-align: left;
-  text-overflow: ellipsis;
-}
-.picker-icon {
-  position: absolute;
-  right: 0;
-  margin: 0 10px 0 2px;
-  color: #070707;
-}
-.xv-picker-button {
-  text-align: left;
+.xv-list-column.first {
+  width: 300px;
 }
-.xv-picker-button .picker-content {
-  max-width: 100px;
-  overflow: hidden;
+.xv-list-column.second {
+  width: 200px;
 }
-.xv-picker-button.disabled {
-  color: #777777;
+.xv-list-column.third {
+  width: 100px;
 }
-.xv-picker-label {
-  color: #070707;
-  padding: 20px 8px 8px 8px;
+.xv-list-column.money,
+.xv-list-column.quantity {
+  width: 75px;
   text-align: right;
-  width: 130px;
 }
-.xv-picker-label.disabled {
-  color: #777777;
+.xv-list-column.descr {
+  width: 200px;
 }
-.xv-combobox .onyx-input-decorator input {
-  width: 145px;
+.xv-list-column.icon {
+  width: 10px;
 }
-.xv-combobox .icon-sort {
-  color: #357ec7;
+.xv-list {
+  background: #f8f8f8;
+}
+.xv-list .xv-list-item > * {
+  display: inline-block;
   vertical-align: middle;
 }
-.xv-combobox-note {
-  padding: 14px 3px 8px 3px;
-  text-align: left;
+.xv-list .xv-list-item {
+  background-color: #fdfdfd;
+  border-bottom: 1px solid #d7d7d7;
+  min-height: 32px;
 }
-/*
-  Styles relating to the grid box
-*/
-/* Entire box including the grid and the summary panel */
-.xv-grid-box {
-  /**
-    This is the most general grid row that
-    is not specific to read-only or selected
-  */
+.xv-list .xv-list-item.header {
+  padding-top: 0;
 }
-.xv-grid-box.small-panel {
-  width: 600px;
+.xv-list .xv-list-item.inactive {
+  background-color: #d8d8d8;
+  color: #070707;
 }
-.xv-grid-box.medium-panel {
-  width: 700px;
+.xv-list .xv-list-item.inactive .xv-list-column .xv-list-attr {
+  background: transparent;
 }
-.xv-grid-box.large-panel {
-  width: 800px;
+.xv-list .xv-list-item.inactive .xv-list-column .xv-list-attr.placeholder {
+  color: #d8d8d8;
 }
-.xv-grid-box .enyo-list-page > *:first-child .xv-grid-row {
-  border-top: 0;
+.xv-list .xv-list-item .xv-list-column .list-icon {
+  padding: 2px;
+  color: #666666;
+  vertical-align: sub;
+  border: 1px solid #efefef;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
 }
-.xv-grid-box .xv-above-grid-list {
-  border: 0;
+.xv-list .xv-list-item.item-selected {
+  background: #226b9a;
+  background-color: #1f608c;
+  background-image: -moz-linear-gradient(top, #226b9a, #1a4f77);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#226b9a), to(#1a4f77));
+  background-image: -webkit-linear-gradient(top, #226b9a, #1a4f77);
+  background-image: -o-linear-gradient(top, #226b9a, #1a4f77);
+  background-image: linear-gradient(to bottom, #226b9a, #1a4f77);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff226b9a', endColorstr='#ff1a4f77', GradientType=0);
 }
-.xv-grid-box .xv-scroller {
-  background: #f8f8f8;
+.xv-list .xv-list-item.item-selected .xv-list-attr {
+  color: #fdfdfd;
 }
-.xv-grid-box .xv-grid-attr {
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 3;
-  -webkit-box-orient: vertical;
+.xv-list .xv-list-item.item-selected .xv-list-attr.placeholder {
+  font-style: italic;
+  color: #99ccff;
 }
-.xv-grid-box .xv-grid-attr.bold {
-  font-weight: bold;
+.xv-list .xv-list-item.item-selected .xv-list-attr.hyperlink {
+  color: #ff6529;
 }
-.xv-grid-box .xv-grid-attr.error {
-  color: #ff0000;
+.xv-list .xv-list-item.item-selected .xv-list-attr.header {
+  background: #99ccff;
 }
-.xv-grid-box .xv-grid-attr.emphasis {
-  color: #009000;
+.xv-list .xv-list-item .xv-list-item-gear {
+  position: absolute;
+  right: 0px;
+  z-index: 999;
 }
-.xv-grid-box .xv-grid-attr.warn {
-  color: #ff9c00;
+.xv-list.xv-grid-list {
+  background: #f8f8f8;
 }
-.xv-grid-box .xv-grid-attr.italic {
-  font-style: italic;
+.xv-list.xv-grid-list .xv-list-item > * {
+  vertical-align: top;
 }
-.xv-grid-box .xv-grid-attr.placeholder {
+.xv-list.xv-grid-list .xv-list-item {
+  padding-top: 7px !important;
+  padding-bottom: 9px !important;
+  border-bottom: 1px solid #aaaaaa !important;
+  background: #f8f8f8;
+}
+.xv-list.xv-grid-list .xv-list-item.item-selected {
+  background: #226b9a;
+  background-color: #1f608c;
+  background-image: -moz-linear-gradient(top, #226b9a, #1a4f77);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#226b9a), to(#1a4f77));
+  background-image: -webkit-linear-gradient(top, #226b9a, #1a4f77);
+  background-image: -o-linear-gradient(top, #226b9a, #1a4f77);
+  background-image: linear-gradient(to bottom, #226b9a, #1a4f77);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff226b9a', endColorstr='#ff1a4f77', GradientType=0);
+}
+.xv-list.xv-grid-list .xv-list-item.item-selected .xv-list-attr {
+  color: #fdfdfd;
+}
+.xv-list.xv-grid-list .xv-list-item.item-selected .xv-list-attr.placeholder {
   font-style: italic;
-  color: #93a1a1;
+  color: #99ccff;
 }
-.xv-grid-box .xv-grid-attr.hyperlink {
-  color: blue;
+.xv-list.xv-grid-list .xv-list-item.item-selected .xv-list-attr.hyperlink {
+  color: #ff6529;
 }
-.xv-grid-box .xv-gridbox-button {
-  color: #357ec7;
-  font-size: 18px;
-  border: none;
-  background: transparent;
+.xv-list.xv-grid-list .xv-list-item.item-selected .xv-list-attr.header {
+  background: #99ccff;
 }
-.xv-grid-box .xv-grid-row {
-  font-size: 12px;
-  background-color: #d8d8d8;
-  border-bottom: 1px solid #aaaaaa;
+.xv-list.xv-grid-list .xv-list-item .xv-list-column {
   vertical-align: top;
-  /**
-      This is the grid header row
-    */
-}
-.xv-grid-box .xv-grid-row > * {
-  display: inline-block;
 }
-.xv-grid-box .xv-grid-row .xv-grid-header {
-  background-color: #d7d7d7;
-  color: #0e0e0e;
-  font-size: .8em;
-  font-weight: bold;
-  text-transform: uppercase;
-  padding-top: 4px;
+.xv-list.xv-grid-list .xv-list-item .xv-list-column .xv-list-attr {
+  font-size: 12px;
 }
-.xv-grid-box .xv-grid-row .xv-grid-header.last {
+.xv-list.xv-grid-list .xv-list-item .xv-list-column.last {
   border-right: none;
 }
-.xv-grid-box .xv-grid-row > * {
-  padding: 6px 4px;
-  border: none;
+.xv-list.xv-grid-list .xv-list-item .xv-list-column.name-column {
+  padding-left: 7px;
 }
-.xv-grid-box .xv-grid-row .line-number {
-  vertical-align: top;
-  width: 30px;
-  text-align: right;
+.xv-list.xv-grid-list .xv-list-item .xv-list-column.first {
+  padding-left: 7px;
 }
-.xv-grid-box .xv-grid-row .grid-actions {
-  display: block;
-  padding-left: 30px;
-  border-radius: 4px;
-  border-width: 0;
-  background: #f3f3f3;
-  margin: 6px;
+.xv-list.xv-grid-list .xv-list-item .xv-list-column.second {
+  padding-left: 7px;
 }
-.xv-grid-box .xv-grid-row .grid-actions > * {
-  display: inline-block;
-  width: 100%;
+.xv-list.xv-grid-list .xv-list-item .xv-list-column.third {
+  padding-left: 7px;
 }
-.xv-grid-box .xv-grid-row .grid-item {
-  vertical-align: top;
-  width: 175px;
+.xv-list.xv-grid-list .xv-list-item .xv-list-column.short {
+  padding-left: 7px;
 }
-.xv-grid-box .xv-grid-row .quantity {
-  vertical-align: top;
-  text-align: right;
-  width: 100px;
+.xv-list.xv-grid-list .xv-list-item .xv-list-column.small {
+  padding-left: 7px;
 }
-.xv-grid-box .xv-grid-row .percent {
-  vertical-align: top;
-  text-align: right;
-  width: 90px;
+.xv-list.xv-grid-list .xv-list-item .xv-list-column.medium {
+  padding-left: 7px;
 }
-.xv-grid-box .xv-grid-row .price {
-  vertical-align: top;
-  text-align: right;
-  width: 90px;
+.xv-list.xv-grid-list .xv-list-item .xv-list-column.descr {
+  padding-left: 7px;
 }
-.xv-grid-box .xv-grid-row .date {
-  vertical-align: top;
-  width: 105px;
+.xv-list.xv-grid-list .xv-list-item .xv-list-column .xv-list-attr {
+  padding: 0px;
 }
-.xv-grid-box .xv-grid-row .user {
-  vertical-align: top;
-  width: 100px;
+.xv-list-attr {
+  padding: 5px;
+  font-size: .8em;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  color: #070707;
 }
-.xv-grid-box .xv-grid-row.readonly {
-  background: #f8f8f8;
-  min-height: 56px;
+.xv-list-attr.header {
+  padding: 4px;
+  background: #d8d8d8;
+  font-size: .7em;
+  font-weight: bold;
+  text-transform: uppercase;
+  color: #fdfdfd;
 }
-.xv-grid-box .xv-grid-row.selected {
-  background-color: #fdfdfd;
-  border: 1px solid #ff6529;
+.xv-list-attr.footer {
+  padding: 4px;
+  background: #d8d8d8;
+  font-size: .7em;
+  font-weight: bold;
+  text-transform: uppercase;
+  color: #070707;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .onyx-input-decorator {
-  padding: 0;
-  width: 100%;
-  margin: 0;
+.xv-list-attr.right {
+  position: absolute;
+  right: 10px;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .onyx-input-decorator input {
-  width: 100%;
-  font-size: 13px;
+.xv-list-attr.text-align-right {
+  text-align: right;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .onyx-picker-decorator {
-  padding-top: 6px;
-  width: 100%;
+.xv-list-attr.bold {
+  font-weight: bold;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .onyx-picker-decorator .onyx-button {
-  height: 26px;
-  padding-top: 3px;
-  width: 100%;
-  font-size: 13px;
+.xv-list-attr.error {
+  color: #ff0000;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-input {
-  border: none;
+.xv-list-attr.emphasis {
+  color: #009000;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-picker-label {
-  display: none;
+.xv-list-attr.warn {
+  color: #ff9c00;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-datewidget {
-  margin-right: 10px;
-  padding-top: 0;
+.xv-list-attr.italic {
+  font-style: italic;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-datewidget .onyx-input-decorator {
-  padding: 0;
-  width: 100%;
+.xv-list-attr.placeholder {
+  font-style: italic;
+  color: #777777;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-datewidget .onyx-input-decorator input {
-  width: 85%;
-  font-size: 13px;
+.xv-list-attr.hyperlink {
+  color: blue;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-numberwidget {
-  padding-top: 6px;
+.xv-list-attr.disabled {
+  color: #777777;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-numberwidget .onyx-input-decorator {
-  padding: 0;
-  width: 100%;
-  margin: 0;
+/* Navigator */
+.xv-navigator-header {
+  font-size: small;
+  font-weight: bold;
+  text-transform: uppercase;
+  color: #ff6600;
+  padding-left: 20px;
+  border-bottom: 1px solid #0e0e0e;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-numberwidget .onyx-input-decorator input {
-  width: 100%;
-  font-size: 13px;
+.xv-workspace-header {
+  color: #fdfdfd;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 8px 0 0 8px;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-combobox {
-  padding-left: 0;
+/**
+ * Default ListItem styles when using a ModelDecorator.
+ */
+.xv-list .xv-model-decorator > .xv-list-item .xv-table {
+  display: table;
+  width: 100%;
+  table-layout: fixed;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-combobox input {
-  padding-top: 3px;
-  width: 80px;
-  font-size: 13px;
+.xv-list .xv-model-decorator > .xv-list-item .xv-table .xv-cell {
+  display: table-cell;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-moneywidget {
-  padding-bottom: 0;
+.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr {
+  /**
+        * Default styling for a model's id (as designated by 'idAttribute')
+        */
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-moneywidget .onyx-input-decorator {
-  padding: 0;
-  width: 100%;
-  margin: 0;
+.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr.xm-attribute-id {
+  color: blue;
+  font-weight: bold;
+  cursor: pointer;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-moneywidget .onyx-input-decorator input {
-  width: 100%;
-  font-size: 13px;
+.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr.xm-attribute-name {
+  font-weight: bold;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-relationwidget .onyx-input-decorator {
-  width: 100%;
-  padding-top: 6px;
+.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr.xm-attributetype-number {
+  text-align: right;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-relationwidget .onyx-input {
-  width: 85%;
-  padding-right: 4px;
+.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr.xm-attributetype-money {
+  text-align: right;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-useraccount-widget .xv-subinput {
-  width: 80px;
-  height: 16px;
+.xv-list .xv-model-decorator > .xv-list-item .xv-list-column.xv-list-attr.xm-attributetype-date {
+  text-align: right;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-subinput {
-  width: 100%;
+.xv-list .xv-model-decorator > .xv-list-item.item-selected .xv-list-attr {
+  color: white;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-input {
-  padding-top: 6px;
-  width: 100%;
-  border: none;
+.xv-list .xv-model-decorator > .xv-list-item.item-selected .xv-list-attr.xm-attribute-id {
+  color: #ff6529;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-label,
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-flexible-label,
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-relationwidget-secondarydescription {
-  display: none;
+/**
+  Styles related to pickers, combo boxes, and relation widgets
+*/
+.onyx-picker-decorator .onyx-button {
+  padding: 12px 8px 12px 8px;
+  width: 150px;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-relationwidget-description {
-  margin: 0;
-  margin-top: 5px;
+.onyx-picker .onyx-menu-item {
+  text-align: left;
+  text-overflow: ellipsis;
 }
-.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-private-item-site-widget {
-  border-bottom: 0;
+.picker-icon {
+  position: absolute;
+  right: 0;
+  margin: 0 10px 0 2px;
+  color: #070707;
 }
-.xv-grid-box.xv-groupbox .xv-sales-summary-panel {
-  border: none;
-  margin-top: 0;
-  padding-left: 0;
-  padding-right: 0;
+.xv-picker-button {
+  text-align: left;
 }
-.xv-grid-box.xv-groupbox .xv-sales-summary-panel .xv-sales-summary-total-group {
-  padding: 0;
-  border: none;
+.xv-picker-button .picker-content {
+  max-width: 100px;
+  overflow: hidden;
 }
-.xv-grid-box.xv-groupbox .xv-sales-summary-panel .xv-sales-summary-total-group .xv-moneywidget {
-  padding-bottom: 0;
-  padding-top: 0;
+.xv-picker-button.disabled {
+  color: #777777;
 }
-.xv-grid-box.xv-groupbox .xv-sales-summary-panel .xv-sales-summary-total-group .xv-moneywidget .xv-input-decorator {
-  padding-bottom: 0;
-  padding-top: 0;
+.xv-picker-label {
+  color: #070707;
+  padding: 20px 8px 8px 8px;
+  text-align: right;
+  width: 130px;
 }
-.xv-grid-box.xv-groupbox .xv-sales-summary-panel .xv-sales-summary-total-group .xv-numberwidget {
-  padding-bottom: 0;
-  padding-top: 0;
+.xv-picker-label.disabled {
+  color: #777777;
 }
-.xv-grid-box.xv-groupbox .xv-sales-summary-panel .xv-sales-summary-total-group .xv-numberwidget .xv-input-decorator {
-  width: 163px;
-  padding-bottom: 0;
-  padding-top: 0;
+.xv-combobox .onyx-input-decorator input {
+  width: 145px;
 }
-.xv-grid-list .xv-list-column {
-  vertical-align: top !important;
+.xv-combobox .icon-sort {
+  color: #357ec7;
+  vertical-align: middle;
+}
+.xv-combobox-note {
+  padding: 14px 3px 8px 3px;
+  text-align: left;
 }
 /*
-  Styles relating to the dashboard
-*/
-/*
-  Variables for widths/colors
+  Styles relating to the grid box
 */
-.dashboard {
-  background-color: #d8d8d8;
-  /*
-    These styles will only be used
-    if the chart is in a dashboard
+/* Entire box including the grid and the summary panel */
+.xv-grid-box {
+  /**
+    This is the most general grid row that
+    is not specific to read-only or selected
   */
 }
-.dashboard .charts-panels {
-  overflow-y: auto;
+.xv-grid-box.small-panel {
+  width: 600px;
 }
-.dashboard .selectable-chart {
-  width: 500px;
-  height: 230px;
+.xv-grid-box.medium-panel {
+  width: 700px;
 }
-.dashboard .selectable-chart .chart-title-bar {
-  width: 500px;
+.xv-grid-box.large-panel {
+  width: 800px;
 }
-.dashboard .nvtooltip {
-  color: black;
+.xv-grid-box .enyo-list-page > *:first-child .xv-grid-row {
+  border-top: 0;
 }
-.selectable-chart {
-  margin: 10px;
-  color: #357ec7;
-  overflow: hidden;
-  /*  The chart-filters may not be need as we are using the class xv-pullout
-      for styles.  Delete when finished hacking the filter styles.
-
-  .chart-filters {
-         background-color: @white;
-         
-         -webkit-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.2);
-         -moz-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.2);
-         box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.2);
-  }
-  
-  .chart-filters .xv-parameter-panel {
-         background-color: @ghost;
-         border: 1px solid @smoke;
-         margin: 0 4px 6px 0;
-         width: 100%;
-  }
-  
-  .chart-filters.xv-parameter-panel .onyx-groupbox-header {
-         padding: 6px 10px;
-         border-bottom: 1px solid @smoke;
-         background: @lightest-gray;
-         color: @near-black;
-  }
-
-  .chart-filters.xv-parameter-panel .enyo-fittable-columns-layout {
-         border-bottom: 1px solid @smoke;
-         background: @white;
-    color: @near-black;
-    position: relative;
-    text-align: left;
-    white-space: nowrap;
-  }
-
-  .chart-filters.xv-parameter-panel .enyo-fittable-columns-layout > * {
-    vertical-align: middle;
-  }
-
-  .chart-filters.xv-parameter-panel .xv-label {
-    text-align: right;
-  }
-  
-  */
+.xv-grid-box .xv-above-grid-list {
+  border: 0;
 }
-.selectable-chart .xv-list-item {
-  border-bottom: 1px solid grey;
-  box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.2);
+.xv-grid-box .xv-scroller {
+  background: #f8f8f8;
 }
-.selectable-chart .xv-list-item .long {
-  padding-left: 7px;
-  width: 250px;
+.xv-grid-box .xv-grid-attr {
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
 }
-.selectable-chart .onyx-popup {
-  margin-top: 40px;
-  margin-left: 200px;
+.xv-grid-box .xv-grid-attr.bold {
+  font-weight: bold;
 }
-.selectable-chart .chart-title-bar {
-  height: 48px;
-  background-color: #efefef;
-  text-transform: none;
-  -webkit-border-top-right-radius: 10px;
-  -moz-border-radius-topright: 10px;
-  border-top-right-radius: 10px;
-  -webkit-border-top-left-radius: 10px;
-  -moz-border-radius-topleft: 10px;
-  border-top-left-radius: 10px;
+.xv-grid-box .xv-grid-attr.error {
+  color: #ff0000;
 }
-.selectable-chart .chart-title-bar .chart-title {
-  padding-top: 8px;
-  color: #070707;
-  text-align: center;
-  /*font-size: 2em;*/
-  font-weight: normal;
-  font-family: Helvetica;
+.xv-grid-box .xv-grid-attr.emphasis {
+  color: #009000;
 }
-.selectable-chart .chart-title-bar .chart-sub-title {
-  /*padding-top: 8px;*/
-  color: #0000ff;
-  text-align: center;
-  font-size: small;
-  font-weight: normal;
-  font-family: Helvetica;
+.xv-grid-box .xv-grid-attr.warn {
+  color: #ff9c00;
 }
-.selectable-chart .chart-title-bar .remove-icon {
-  position: absolute;
-  top: 0;
-  right: 0;
+.xv-grid-box .xv-grid-attr.italic {
+  font-style: italic;
 }
-.selectable-chart .chart-title-bar .icon-filter {
-  color: #070707;
-  position: absolute;
-  right: 35px;
+.xv-grid-box .xv-grid-attr.placeholder {
+  font-style: italic;
+  color: #93a1a1;
 }
-.selectable-chart .chart-bottom {
-  background-color: #fdfdfd;
-  border: 1px solid #444444;
-  border-top: none;
-  -webkit-border-bottom-right-radius: 10px;
-  -moz-border-radius-bottomright: 10px;
-  border-bottom-right-radius: 10px;
-  -webkit-border-bottom-left-radius: 10px;
-  -moz-border-radius-bottomleft: 10px;
-  border-bottom-left-radius: 10px;
+.xv-grid-box .xv-grid-attr.hyperlink {
+  color: blue;
 }
-.selectable-chart .chart-bottom .xv-picker-label {
-  width: 100px;
-  color: #070707;
+.xv-grid-box .xv-gridbox-button {
+  color: #357ec7;
+  font-size: 18px;
+  border: none;
+  background: transparent;
 }
-.selectable-chart .chart-bottom .onyx-button {
-  width: 130px;
-  padding: 10px 10px;
+.xv-grid-box .xv-grid-row {
+  font-size: 12px;
+  background-color: #d8d8d8;
+  border-bottom: 1px solid #aaaaaa;
+  vertical-align: top;
+  /**
+      This is the grid header row
+    */
 }
-.selectable-chart .chart-filterDrawer {
-  top: 0px;
+.xv-grid-box .xv-grid-row > * {
+  display: inline-block;
 }
-/**
-  Styles relating to Lists
-*/
-.xv-list-header {
-  background-color: #d8d8d8;
-  color: #fdfdfd;
-  font-size: .6em;
+.xv-grid-box .xv-grid-row .xv-grid-header {
+  background-color: #d7d7d7;
+  color: #0e0e0e;
+  font-size: .8em;
   font-weight: bold;
   text-transform: uppercase;
   padding-top: 4px;
-  padding-bottom: 4px;
-  border-bottom: 1px solid #aaaaaa;
 }
-.xv-list-header .xv-list-column.last {
+.xv-grid-box .xv-grid-row .xv-grid-header.last {
   border-right: none;
 }
-.xv-list-header .xv-list-column.name-column,
-.xv-list-header .xv-list-column.first,
-.xv-list-header .xv-list-column.second,
-.xv-list-header .xv-list-column.third,
-.xv-list-header .xv-list-column.short,
-.xv-list-header .xv-list-column.small,
-.xv-list-header .xv-list-column.medium,
-.xv-list-header .xv-list-column.descr {
-  padding-left: 7px;
+.xv-grid-box .xv-grid-row > * {
+  padding: 6px 4px;
+  border: none;
 }
-/* List */
-.xv-list-column.line-number {
+.xv-grid-box .xv-grid-row .line-number {
+  vertical-align: top;
   width: 30px;
   text-align: right;
 }
-.xv-list-column.name-column {
-  width: 200px;
+.xv-grid-box .xv-grid-row .grid-actions {
+  display: block;
+  padding-left: 30px;
+  border-radius: 4px;
+  border-width: 0;
+  background: #f3f3f3;
+  margin: 6px;
 }
-.xv-list-column.right-column {
-  width: 100px;
-  text-align: right;
+.xv-grid-box .xv-grid-row .grid-actions > * {
+  display: inline-block;
+  width: 100%;
 }
-.xv-list-column.short {
-  width: 100px;
+.xv-grid-box .xv-grid-row .grid-item {
+  vertical-align: top;
+  width: 175px;
 }
-.xv-list-column.small {
-  width: 125px;
+.xv-grid-box .xv-grid-row .quantity {
+  vertical-align: top;
+  text-align: right;
+  width: 100px;
 }
-.xv-list-column.medium {
-  width: 150px;
+.xv-grid-box .xv-grid-row .percent {
+  vertical-align: top;
+  text-align: right;
+  width: 90px;
 }
-.xv-list-column.first {
-  width: 300px;
+.xv-grid-box .xv-grid-row .price {
+  vertical-align: top;
+  text-align: right;
+  width: 90px;
 }
-.xv-list-column.second {
-  width: 200px;
+.xv-grid-box .xv-grid-row .date {
+  vertical-align: top;
+  width: 105px;
 }
-.xv-list-column.third {
+.xv-grid-box .xv-grid-row .user {
+  vertical-align: top;
   width: 100px;
 }
-.xv-list-column.money,
-.xv-list-column.quantity {
-  width: 75px;
-  text-align: right;
+.xv-grid-box .xv-grid-row.readonly {
+  background: #f8f8f8;
+  min-height: 56px;
 }
-.xv-list-column.descr {
-  width: 200px;
+.xv-grid-box .xv-grid-row.selected {
+  background-color: #fdfdfd;
+  border: 1px solid #ff6529;
 }
-.xv-list-column.icon {
-  width: 10px;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .onyx-input-decorator {
+  padding: 0;
+  width: 100%;
+  margin: 0;
 }
-.xv-list {
-  background: #f8f8f8;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .onyx-input-decorator input {
+  width: 100%;
+  font-size: 13px;
 }
-.xv-list .xv-list-item > * {
-  display: inline-block;
-  vertical-align: middle;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .onyx-picker-decorator {
+  padding-top: 6px;
+  width: 100%;
 }
-.xv-list .xv-list-item {
-  background-color: #fdfdfd;
-  border-bottom: 1px solid #d7d7d7;
-  min-height: 32px;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .onyx-picker-decorator .onyx-button {
+  height: 26px;
+  padding-top: 3px;
+  width: 100%;
+  font-size: 13px;
 }
-.xv-list .xv-list-item.header {
-  padding-top: 0;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-input {
+  border: none;
 }
-.xv-list .xv-list-item.inactive {
-  background-color: #d8d8d8;
-  color: #070707;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-picker-label {
+  display: none;
 }
-.xv-list .xv-list-item.inactive .xv-list-column .xv-list-attr {
-  background: transparent;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-datewidget {
+  margin-right: 10px;
+  padding-top: 0;
 }
-.xv-list .xv-list-item.inactive .xv-list-column .xv-list-attr.placeholder {
-  color: #d8d8d8;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-datewidget .onyx-input-decorator {
+  padding: 0;
+  width: 100%;
 }
-.xv-list .xv-list-item .xv-list-column .list-icon {
-  padding: 2px;
-  color: #666666;
-  vertical-align: sub;
-  border: 1px solid #efefef;
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-datewidget .onyx-input-decorator input {
+  width: 85%;
+  font-size: 13px;
 }
-.xv-list .xv-list-item.item-selected {
-  background: #226b9a;
-  background-color: #1f608c;
-  background-image: -moz-linear-gradient(top, #226b9a, #1a4f77);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#226b9a), to(#1a4f77));
-  background-image: -webkit-linear-gradient(top, #226b9a, #1a4f77);
-  background-image: -o-linear-gradient(top, #226b9a, #1a4f77);
-  background-image: linear-gradient(to bottom, #226b9a, #1a4f77);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff226b9a', endColorstr='#ff1a4f77', GradientType=0);
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-numberwidget {
+  padding-top: 6px;
 }
-.xv-list .xv-list-item.item-selected .xv-list-attr {
-  color: #fdfdfd;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-numberwidget .onyx-input-decorator {
+  padding: 0;
+  width: 100%;
+  margin: 0;
 }
-.xv-list .xv-list-item.item-selected .xv-list-attr.placeholder {
-  font-style: italic;
-  color: #99ccff;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-numberwidget .onyx-input-decorator input {
+  width: 100%;
+  font-size: 13px;
 }
-.xv-list .xv-list-item.item-selected .xv-list-attr.hyperlink {
-  color: #ff6529;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-combobox {
+  padding-left: 0;
 }
-.xv-list .xv-list-item.item-selected .xv-list-attr.header {
-  background: #99ccff;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-combobox input {
+  padding-top: 3px;
+  width: 80px;
+  font-size: 13px;
 }
-.xv-list .xv-list-item .xv-list-item-gear {
-  position: absolute;
-  right: 0px;
-  z-index: 999;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-moneywidget {
+  padding-bottom: 0;
 }
-.xv-list.xv-grid-list {
-  background: #f8f8f8;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-moneywidget .onyx-input-decorator {
+  padding: 0;
+  width: 100%;
+  margin: 0;
 }
-.xv-list.xv-grid-list .xv-list-item > * {
-  vertical-align: top;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-moneywidget .onyx-input-decorator input {
+  width: 100%;
+  font-size: 13px;
 }
-.xv-list.xv-grid-list .xv-list-item {
-  padding-top: 7px !important;
-  padding-bottom: 9px !important;
-  border-bottom: 1px solid #aaaaaa !important;
-  background: #f8f8f8;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-relationwidget .onyx-input-decorator {
+  width: 100%;
+  padding-top: 6px;
 }
-.xv-list.xv-grid-list .xv-list-item.item-selected {
-  background: #226b9a;
-  background-color: #1f608c;
-  background-image: -moz-linear-gradient(top, #226b9a, #1a4f77);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#226b9a), to(#1a4f77));
-  background-image: -webkit-linear-gradient(top, #226b9a, #1a4f77);
-  background-image: -o-linear-gradient(top, #226b9a, #1a4f77);
-  background-image: linear-gradient(to bottom, #226b9a, #1a4f77);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff226b9a', endColorstr='#ff1a4f77', GradientType=0);
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-relationwidget .onyx-input {
+  width: 85%;
+  padding-right: 4px;
 }
-.xv-list.xv-grid-list .xv-list-item.item-selected .xv-list-attr {
-  color: #fdfdfd;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-useraccount-widget .xv-subinput {
+  width: 80px;
+  height: 16px;
 }
-.xv-list.xv-grid-list .xv-list-item.item-selected .xv-list-attr.placeholder {
-  font-style: italic;
-  color: #99ccff;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-subinput {
+  width: 100%;
 }
-.xv-list.xv-grid-list .xv-list-item.item-selected .xv-list-attr.hyperlink {
-  color: #ff6529;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-input {
+  padding-top: 6px;
+  width: 100%;
+  border: none;
 }
-.xv-list.xv-grid-list .xv-list-item.item-selected .xv-list-attr.header {
-  background: #99ccff;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-label,
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-flexible-label,
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-relationwidget-secondarydescription {
+  display: none;
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column {
-  vertical-align: top;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-relationwidget-description {
+  margin: 0;
+  margin-top: 5px;
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column .xv-list-attr {
-  font-size: 12px;
+.xv-grid-box .xv-grid-row.selected .xv-grid-column .xv-private-item-site-widget {
+  border-bottom: 0;
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column.last {
-  border-right: none;
+.xv-grid-box.xv-groupbox .xv-sales-summary-panel {
+  border: none;
+  margin-top: 0;
+  padding-left: 0;
+  padding-right: 0;
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column.name-column {
-  padding-left: 7px;
+.xv-grid-box.xv-groupbox .xv-sales-summary-panel .xv-sales-summary-total-group {
+  padding: 0;
+  border: none;
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column.first {
-  padding-left: 7px;
+.xv-grid-box.xv-groupbox .xv-sales-summary-panel .xv-sales-summary-total-group .xv-moneywidget {
+  padding-bottom: 0;
+  padding-top: 0;
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column.second {
-  padding-left: 7px;
+.xv-grid-box.xv-groupbox .xv-sales-summary-panel .xv-sales-summary-total-group .xv-moneywidget .xv-input-decorator {
+  padding-bottom: 0;
+  padding-top: 0;
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column.third {
-  padding-left: 7px;
+.xv-grid-box.xv-groupbox .xv-sales-summary-panel .xv-sales-summary-total-group .xv-numberwidget {
+  padding-bottom: 0;
+  padding-top: 0;
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column.short {
-  padding-left: 7px;
+.xv-grid-box.xv-groupbox .xv-sales-summary-panel .xv-sales-summary-total-group .xv-numberwidget .xv-input-decorator {
+  width: 163px;
+  padding-bottom: 0;
+  padding-top: 0;
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column.small {
-  padding-left: 7px;
+.xv-grid-list .xv-list-column {
+  vertical-align: top !important;
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column.medium {
-  padding-left: 7px;
+/*
+  Styles relating to the dashboard
+*/
+/*
+  Variables for widths/colors
+*/
+.dashboard {
+  background-color: #d8d8d8;
+  /*
+    These styles will only be used
+    if the chart is in a dashboard
+  */
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column.descr {
-  padding-left: 7px;
+.dashboard .charts-panels {
+  overflow-y: auto;
 }
-.xv-list.xv-grid-list .xv-list-item .xv-list-column .xv-list-attr {
-  padding: 0px;
+.dashboard .selectable-chart {
+  width: 500px;
+  height: 230px;
 }
-.xv-list-attr {
-  padding: 5px;
-  font-size: .8em;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  color: #070707;
+.dashboard .selectable-chart .chart-title-bar {
+  width: 500px;
 }
-.xv-list-attr.header {
-  padding: 4px;
-  background: #d8d8d8;
-  font-size: .7em;
-  font-weight: bold;
-  text-transform: uppercase;
-  color: #fdfdfd;
+.dashboard .nvtooltip {
+  color: black;
 }
-.xv-list-attr.footer {
-  padding: 4px;
-  background: #d8d8d8;
-  font-size: .7em;
-  font-weight: bold;
-  text-transform: uppercase;
-  color: #070707;
+.selectable-chart {
+  margin: 10px;
+  color: #357ec7;
+  overflow: hidden;
+  /*  The chart-filters may not be need as we are using the class xv-pullout
+      for styles.  Delete when finished hacking the filter styles.
+
+  .chart-filters {
+         background-color: @white;
+         
+         -webkit-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.2);
+         -moz-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.2);
+         box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.2);
+  }
+  
+  .chart-filters .xv-parameter-panel {
+         background-color: @ghost;
+         border: 1px solid @smoke;
+         margin: 0 4px 6px 0;
+         width: 100%;
+  }
+  
+  .chart-filters.xv-parameter-panel .onyx-groupbox-header {
+         padding: 6px 10px;
+         border-bottom: 1px solid @smoke;
+         background: @lightest-gray;
+         color: @near-black;
+  }
+
+  .chart-filters.xv-parameter-panel .enyo-fittable-columns-layout {
+         border-bottom: 1px solid @smoke;
+         background: @white;
+    color: @near-black;
+    position: relative;
+    text-align: left;
+    white-space: nowrap;
+  }
+
+  .chart-filters.xv-parameter-panel .enyo-fittable-columns-layout > * {
+    vertical-align: middle;
+  }
+
+  .chart-filters.xv-parameter-panel .xv-label {
+    text-align: right;
+  }
+  
+  */
 }
-.xv-list-attr.right {
-  position: absolute;
-  right: 10px;
+.selectable-chart .xv-list-item {
+  border-bottom: 1px solid grey;
+  box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.2);
 }
-.xv-list-attr.text-align-right {
-  text-align: right;
+.selectable-chart .xv-list-item .long {
+  padding-left: 7px;
+  width: 250px;
 }
-.xv-list-attr.bold {
-  font-weight: bold;
+.selectable-chart .onyx-popup {
+  margin-top: 40px;
+  margin-left: 200px;
 }
-.xv-list-attr.error {
-  color: #ff0000;
+.selectable-chart .chart-title-bar {
+  height: 48px;
+  background-color: #efefef;
+  text-transform: none;
+  -webkit-border-top-right-radius: 10px;
+  -moz-border-radius-topright: 10px;
+  border-top-right-radius: 10px;
+  -webkit-border-top-left-radius: 10px;
+  -moz-border-radius-topleft: 10px;
+  border-top-left-radius: 10px;
 }
-.xv-list-attr.emphasis {
-  color: #009000;
+.selectable-chart .chart-title-bar .chart-title {
+  padding-top: 8px;
+  color: #070707;
+  text-align: center;
+  /*font-size: 2em;*/
+  font-weight: normal;
+  font-family: Helvetica;
 }
-.xv-list-attr.warn {
-  color: #ff9c00;
+.selectable-chart .chart-title-bar .chart-sub-title {
+  /*padding-top: 8px;*/
+  color: #0000ff;
+  text-align: center;
+  font-size: small;
+  font-weight: normal;
+  font-family: Helvetica;
 }
-.xv-list-attr.italic {
-  font-style: italic;
+.selectable-chart .chart-title-bar .remove-icon {
+  position: absolute;
+  top: 0;
+  right: 0;
 }
-.xv-list-attr.placeholder {
-  font-style: italic;
-  color: #777777;
+.selectable-chart .chart-title-bar .icon-filter {
+  color: #070707;
+  position: absolute;
+  right: 35px;
 }
-.xv-list-attr.hyperlink {
-  color: blue;
+.selectable-chart .chart-bottom {
+  background-color: #fdfdfd;
+  border: 1px solid #444444;
+  border-top: none;
+  -webkit-border-bottom-right-radius: 10px;
+  -moz-border-radius-bottomright: 10px;
+  border-bottom-right-radius: 10px;
+  -webkit-border-bottom-left-radius: 10px;
+  -moz-border-radius-bottomleft: 10px;
+  border-bottom-left-radius: 10px;
 }
-.xv-list-attr.disabled {
-  color: #777777;
+.selectable-chart .chart-bottom .xv-picker-label {
+  width: 100px;
+  color: #070707;
 }
-/* Navigator */
-.xv-navigator-header {
-  font-size: small;
-  font-weight: bold;
-  text-transform: uppercase;
-  color: #ff6600;
-  padding-left: 20px;
-  border-bottom: 1px solid #0e0e0e;
+.selectable-chart .chart-bottom .onyx-button {
+  width: 130px;
+  padding: 10px 10px;
 }
-.xv-workspace-header {
-  color: #fdfdfd;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 8px 0 0 8px;
+.selectable-chart .chart-filterDrawer {
+  top: 0px;
 }
 /**
   Styles relating to widgets in the pullout
@@ -2778,17 +2778,17 @@ body {
 .xv-pullout {
   /* Setting this as min-width overrides enyo-narrow 100% */
   width: 320px;
-  -webkit-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0.2);
-  box-shadow: -2px -2px 6px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0);
+  -moz-box-shadow: -2px -2px 6px rgba(0, 0, 0, 0);
+  box-shadow: -2px -2px 6px rgba(0, 0, 0, 0);
   position: absolute;
   top: 55px;
   left: 0;
   bottom: 0;
   background-color: #fdfdfd;
-  -webkit-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0);
+  -moz-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0);
+  box-shadow: 4px 4px 10px rgba(0, 0, 0, 0);
 }
 .xv-pullout .xv-header {
   background-color: #fdfdfd;

diff --git a/lib/tools/lib/package.js b/lib/tools/lib/package.js
index cc3f5ea..55b83f6 100644 (file)
--- a/lib/tools/lib/package.js
+++ b/lib/tools/lib/package.js
@@ -1,7 +1,7 @@
 var depends = (typeof enyo !== 'undefined') ? enyo.depends : X.depends;
 depends(
-  "../../../node_modules/underscore/underscore.js",
-  "../../../node_modules/async/lib/async.js",
-  "../../../node_modules/globalize/lib/globalize.js",
-  '../../../node_modules/moment/moment.js'
+  "../../module/underscore/underscore.js",
+  "../../module/async/lib/async.js",
+  "../../module/globalize/lib/globalize.js",
+  '../../module/moment/moment.js'
 );

diff --git a/package.json b/package.json
index 8b3dd74..10c1e0f 100644 (file)
--- a/package.json
+++ b/package.json
@@ -91,6 +91,7 @@
     "build-basic-quickstart": "./scripts/build_app.js -d quickstart --databaseonly -e foundation-database -i -s foundation-database/quickstart_data.sql",
     "jshint": "./node_modules/.bin/jshint --exclude node-datasource/lib/query/node_modules lib/backbone-x/source lib/enyo-x/source lib/tools/source enyo-client/application/source/ enyo-client/extensions node-datasource",
     "preinstall": "cd node-datasource/lib/query ; npm install",
+    "postinstall": "ln -s ../../lib/ enyo-client/application/lib && ln -s ../node_modules lib/module && ln -s ../../lib/enyo-x/enyo enyo-client/application/enyo",
     "start": "node_modules/.bin/nodemon --debug --watch node-datasource",
     "test": "./node_modules/.bin/mocha -R spec test/lib/login.js test/models/* test/database/* test/extensions/* test/lib/test_runner.js",
     "test-build": "./node_modules/.bin/mocha -R spec test/build/build_app.js",

diff --git a/scripts/install_xtuple.sh b/scripts/install_xtuple.sh
index c19ded0..d168eee 100644 (file)
--- a/scripts/install_xtuple.sh
+++ b/scripts/install_xtuple.sh
@@ -23,7 +23,7 @@ sudo apt-get -q -y install \
   python-software-properties \
   software-properties-common
 
-NODE_VERSION=0.10.26
+NODE_VERSION=0.8.26
 
 DEBDIST=`lsb_release -c -s`
 echo "Trying to install xTuple for platform ${DEBDIST}"

diff --git a/scripts/lib/build_client.js b/scripts/lib/build_client.js
index 201c366..7fe466a 100755 (executable)
--- a/scripts/lib/build_client.js
+++ b/scripts/lib/build_client.js
@@ -236,7 +236,7 @@ var _ = require('underscore'),
       //
       fs.exists(enyoDir, function (exists) {
         if (!exists) {
-          fs.symlink(path.join(__dirname, "../../lib/enyo-x/enyo"), enyoDir, function (err) {
+          fs.symlink(path.join(__dirname, "../../enyo-client/application/enyo"), enyoDir, function (err) {
             if (err) {
               callback(err);
               return;