From 6abdfac20c744c3c19a51112b04a44632d3450a4 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Tue, 8 Jul 2014 13:57:35 +0200 Subject: [PATCH] Android building updates --- Gemfile | 5 +- Gemfile.lock | 6 +- .../twitter-bootstrap/application.css | 14 - .../bootstrap_and_overrides.css.sass | 33 -- .../bootstrap_overrides.css.sass | 30 -- .../user/wood1/_constants.css.sass | 83 ----- .../user/wood1/active_list.css.sass | 16 - .../stylesheets/user/wood1/application.css | 17 - .../stylesheets/user/wood1/darkstrap.sass | 300 ------------------ .../stylesheets/user/wood1/header.css.sass | 20 -- .../user/wood1/list_products.css.sass | 12 - app/assets/stylesheets/user/wood1/mixins.sass | 41 --- .../stylesheets/user/wood1/qr_list.css.sass | 9 - .../stylesheets/user/wood1/side_menu.css.sass | 23 -- .../stylesheets/user/wood1/structure.css.sass | 136 -------- app/views/layouts/theme1-home.html.slim | 17 +- bin/build_mobile_app.rb | 4 + make_mobile | 4 +- 18 files changed, 23 insertions(+), 747 deletions(-) delete mode 100644 app/assets/stylesheets/twitter-bootstrap/application.css delete mode 100644 app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass delete mode 100644 app/assets/stylesheets/twitter-bootstrap/bootstrap_overrides.css.sass delete mode 100644 app/assets/stylesheets/user/wood1/_constants.css.sass delete mode 100644 app/assets/stylesheets/user/wood1/active_list.css.sass delete mode 100644 app/assets/stylesheets/user/wood1/application.css delete mode 100644 app/assets/stylesheets/user/wood1/darkstrap.sass delete mode 100644 app/assets/stylesheets/user/wood1/header.css.sass delete mode 100644 app/assets/stylesheets/user/wood1/list_products.css.sass delete mode 100644 app/assets/stylesheets/user/wood1/mixins.sass delete mode 100644 app/assets/stylesheets/user/wood1/qr_list.css.sass delete mode 100644 app/assets/stylesheets/user/wood1/side_menu.css.sass delete mode 100644 app/assets/stylesheets/user/wood1/structure.css.sass diff --git a/Gemfile b/Gemfile index e360a371..a2922e82 100644 --- a/Gemfile +++ b/Gemfile @@ -21,8 +21,9 @@ group :assets do gem 'sass-rails' #, '~> 4.0.2' gem 'coffee-rails' #, '~> 3.2.1' #gem 'twitter-bootstrap-rails' - #gem 'bootstrap-sass', '~>2.3' - #gem 'bourbon' + # Only for mobile assets precompile, not used in this project + gem 'bootstrap-sass', '~>2.3' + gem 'bourbon' #gem 'compass-rails' gem 'js-routes' gem "font-awesome-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 1bf3079b..1087c129 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/bterkuile/cmtool.git - revision: 05fce4c40a0c90e7e859ee331c7e9756716c1239 + revision: 98191722e04dc3bd8b96be347929215e7d7c9059 specs: cmtool (1.0.0) bourbon @@ -86,6 +86,8 @@ GEM barber (>= 0.4.1) emblem-source bcrypt (3.1.7) + bootstrap-sass (2.3.2.2) + sass (~> 3.2) bourbon (3.2.3) sass (~> 3.2) thor @@ -378,6 +380,8 @@ PLATFORMS DEPENDENCIES active_decorator + bootstrap-sass (~> 2.3) + bourbon capybara capybara-webkit cmtool! diff --git a/app/assets/stylesheets/twitter-bootstrap/application.css b/app/assets/stylesheets/twitter-bootstrap/application.css deleted file mode 100644 index 62ed3bea..00000000 --- a/app/assets/stylesheets/twitter-bootstrap/application.css +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. - * - *= require_self - *= require_directory . - * require 'bootstrap-devise-rails' - */ diff --git a/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass b/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass deleted file mode 100644 index ac3c6b1c..00000000 --- a/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass +++ /dev/null @@ -1,33 +0,0 @@ -@import "bootstrap" -body - //padding-top: 42px - .table - &.table-condensed - margin-bottom: 5px -@import "bootstrap-responsive" - -// Set the correct sprite paths -//@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png'); -//@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png'); - -// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines) -// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not -// have the proper paths. So for now we use the absolute path. -//@fontAwesomeEotPath: '/assets/fontawesome-webfont.eot'; -//@fontAwesomeWoffPath: '/assets/fontawesome-webfont.woff'; -//@fontAwesomeTtfPath: '/assets/fontawesome-webfont.ttf'; -//@fontAwesomeSvgPath: '/assets/fontawesome-webfont.svg'; - -// Font Awesome -//@import "fontawesome"; - -// Your custom LESS stylesheets goes here -// -// Since bootstrap was imported above you have access to its mixins which -// you may use and inherit here -// -// If you'd like to override bootstrap's own variables, you can do so here as well -// See http://twitter.github.com/bootstrap/less.html for their names and documentation -// -// Example: -// @linkColor: #ff0000; diff --git a/app/assets/stylesheets/twitter-bootstrap/bootstrap_overrides.css.sass b/app/assets/stylesheets/twitter-bootstrap/bootstrap_overrides.css.sass deleted file mode 100644 index be0e48f4..00000000 --- a/app/assets/stylesheets/twitter-bootstrap/bootstrap_overrides.css.sass +++ /dev/null @@ -1,30 +0,0 @@ - -//BOOTSTRAP overrides -body - .navbar-inner - $navbar-inner-teint: 200 - background-color: rgba($navbar-inner-teint, $navbar-inner-teint, $navbar-inner-teint, 0.8) - background-image: url() - .brand - padding: 3px 0 - .container - .brand - padding-left: 7px - .pagination - li - a - background-color: rgba(0, 0, 0, 0.4) - dl - &.dl-horizontal - dt - &:after - content: ' :' - dd - &:after - content: '\a0' - form - .controls - label - display: inline-block - padding-left: 1em - padding-right: 1em diff --git a/app/assets/stylesheets/user/wood1/_constants.css.sass b/app/assets/stylesheets/user/wood1/_constants.css.sass deleted file mode 100644 index 5c8759cb..00000000 --- a/app/assets/stylesheets/user/wood1/_constants.css.sass +++ /dev/null @@ -1,83 +0,0 @@ -$qbrown: #853d15 -$qbrown-active: lighten($qbrown, 20%) -$green: #7BB459 //Heineken -//$green: //Heineken -//$wood: image-url('textures/wood001-vertical.jpg') -$wood: image-url('textures/theme1.jpg') -$background-brown: #57351f -$side-spacing: 5px -=wood-button - background-color: transparent - background-repeat: no-repeat, no-repeat, repeat-x - background-position: left center, right center, center center - background-image: image-url('theme1/button-wood-left.png'), image-url('theme1/button-wood-right.png'), image-url('theme1/button-wood-middle.png') - color: white - border-width: 0 - border-radius: 0 - height: 31px - //padding-bottom: 18px - +box-shadow(#000 4px 4px 8px) - &:hover - background-color: transparent - background-repeat: no-repeat, no-repeat, repeat-x - background-position: left center, right center, center center - background-image: image-url('theme1/button-wood-left.png'), image-url('theme1/button-wood-right.png'), image-url('theme1/button-wood-middle.png') - color: black -=button-bar - background-color: transparent - background-repeat: no-repeat, no-repeat - background-position: left bottom, right bottom - background-image: image-url('theme1/button-bar-left.png'), image-url('theme1/button-bar-right.png') - color: $green - border-width: 0 - border-radius: 0 - min-height: 61px - height: 61px - padding-left: 49px - padding-right: 52px - .button-bar-inner - //+single-box-shadow(#000, 0px, 4px, 8px, 0px, true) - background-color: white - background-repeat: repeat-x - background-position: center bottom - background-image: image-url('theme1/button-bar-middle.png') - //min-height: 61px - height: 100% - .button-bar-content - padding: 8px - .title - margin-top: 4px - margin-right: 5px - margin-left: 5px - margin-bottom: 3px - font-size: 1.1em - line-height: 1.1em - color: black - float: left - .main-buttons - float: left - margin-right: 12px - .action-buttons - float: left - width: 150px - //padding-bottom: 18px - //+box-shadow(#000 4px 4px 8px) -=user-button - +wood-button - cursor: pointer - border: 0px solid black - //+border-radius(4px) - //+box-shadow(#000 4px 4px 8px) - width: 30px - //height: 34px - display: inline-block - float: left - margin-right: 15px - background-color: $qbrown - text-align: center - line-height: 34px - &.active - background-color: $qbrown-active - &.hide - display: none - diff --git a/app/assets/stylesheets/user/wood1/active_list.css.sass b/app/assets/stylesheets/user/wood1/active_list.css.sass deleted file mode 100644 index 6a0bb9cd..00000000 --- a/app/assets/stylesheets/user/wood1/active_list.css.sass +++ /dev/null @@ -1,16 +0,0 @@ -.list-table, #active-list-table - tbody - tr - td - &:first-child - padding-left: 35px - background-position: 5px center - background-repeat: no-repeat - &.active - td - &:first-child - background-image: image-url('icons/order-check.png') - &.delivered - td - &:first-child - background-image: image-url('icons/order-doublecheck.png') diff --git a/app/assets/stylesheets/user/wood1/application.css b/app/assets/stylesheets/user/wood1/application.css deleted file mode 100644 index 8a494984..00000000 --- a/app/assets/stylesheets/user/wood1/application.css +++ /dev/null @@ -1,17 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. - * - *= require 'twitter-bootstrap/bootstrap_and_overrides' - *= require 'twitter-bootstrap/bootstrap_overrides' - *= require 'general' - *= require font-awesome - *= require_directory . - *= require_self - */ diff --git a/app/assets/stylesheets/user/wood1/darkstrap.sass b/app/assets/stylesheets/user/wood1/darkstrap.sass deleted file mode 100644 index 7955f355..00000000 --- a/app/assets/stylesheets/user/wood1/darkstrap.sass +++ /dev/null @@ -1,300 +0,0 @@ -@import compass -@import ./mixins - -// Contents: -// =General -// =Breadcrumbs -// =Headings -// =Navigation -// =Forms -// =Tables -// =Pagination -// =Misc - -$color: #c6c6c6 -$bg: #2f2f2f -$link: #0088cc - -$warning: #faa732 -$success: #5bb75b -$error: #fc5b5e - -// ds original: #FB292D -$info: #3a87ad - -$input-bg: #666666 - -// ds default: #444 -$input-border: #111111 - -// default: white -$input-placeholder: #666666 -$input-color: white - -//=General ======================================== -// Everything with the inset panel just extends .well -.well - //+inset-panel-dark - background-color: rgba(255,255,255,0.8) - h1,h2,h3,h4,h5,h6,a - color: #333 - .table - thead - color: #111 - td - border-top-color: #aaa - color: #111 - -.table-striped - tbody tr:nth-child(2n+1) - td, th - background-color: #444 - -body - background: $bg - color: $color - -//=Breadcrumbs ======================================= -.breadcrumb - @extend .well - border: 0 - //over bs - li - text-shadow: 0 1px 0 #000 - //over bs - -//=Headings ====================================== -.page-header - +horizontal-rule-dark - -h1,h2,h3,h4,h5,h6 - color: white - -h6 - color: #999 - -//=Navigation -.nav .dropdown-menu - -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > .open.active > a:hover - background-color: darken($bg, 5%) - border-color: $bg $bg transparent $bg - -.nav > .dropdown.active > a:hover - color: #fff - -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret - border-top-color: #fff - -.nav-tabs - border-bottom: 1px solid #666 - & > .active > a, - & > .active > a:hover - background-color: $bg - color: #fff - border-color: #666 #666 transparent #666 - & > li > a:hover - border-color: $bg $bg #666666 $bg - background-color: darken($bg, 5%) - color: lighten($link, 10%) - &.nav-stacked - & > li > a, - & > li > a:hover - border-color: #666 - -.nav-pills - & > li > a:hover - background-color: darken($bg, 5%) - color: lighten($link, 10%) - -.nav-list > li > a, -.nav-list .nav-header - text-shadow: 0 1px 0 #000 - -.nav-list > li > a:hover - background-color: darken($bg, 10%) - color: lighten($link, 10%) - -.nav-list .active - & > a:hover - background-color: #0088cc - color: white - -.tabs-below .nav-tabs - border-top: 1px solid #666 - -.tabs-left .nav-tabs - border-right: 1px solid #666 - -.tabs-right .nav-tabs - border-left: 1px solid #666 - -.tabs-below .nav-tabs > li > a:hover - border-top: 1px solid #666 - -.tabs-left .nav-tabs > li > a:hover - border-color: transparent #666 transparent transparent - -.tabs-right .nav-tabs > li > a:hover - border-color: transparent transparent transparent #666 - -.tabs-below .nav-tabs .active > a, -.tabs-below .nav-tabs .active > a:hover - border-color: transparent #666 #666 #666 - -.tabs-left .nav-tabs .active > a, -.tabs-left .nav-tabs .active > a:hover - border-color: #666 transparent #666 #666 - -.tabs-right .nav-tabs .active > a, -.tabs-right .nav-tabs .active > a:hover - border-color: #666 #666 #666 transparent - -//=Forms ======================================== -+placeholder($input-placeholder) - -.input-prepend .add-on, -.input-append .add-on - background: #444 - color: $color - border-color: #111 - text-shadow: 0 1px 0 black - -label - color: $color - -input, -input[type="file"], -select, -textarea - color: $input-color - //background-color: $input-bg; - border-color: $input-border - @extend .well - -.search-query - -webkit-box-shadow: rgba(255, 255, 255, 0.1) 0 1px 0, rgba(0, 0, 0, 0) 0 1px 7px 0px inset - -legend - color: white - +horizontal-rule-dark - -.form-actions - border-top-color: #222 - background-color: #444 - -.help-inline - color: #999 - -.control-group - &.warning - +controls($warning) - &.success - +controls($success) - &.error - +controls($error) - -//=Tables ======================================== -.table - thead - color: white - td - border-top-color: #666 - -.table-striped - tbody tr:nth-child(2n+1) - td, th - background-color: #444 - -.table-bordered - border: 1px solid #666 - th + th, - td + td, - th + td, - td + th - border-left: 1px solid #666 - -//=Pagination -.pagination a:hover - color: lighten($link, 10%) - background-color: darken($bg, 5%) - -.pagination .active a - color: #fff - background-color: darken($bg, 5%) - -.pagination a - border-color: #666 - -//=Pager -.pager a - background-color: $bg - border-color: #666 - &:hover - background-color: darken($bg, 5%) - color: lighten($link, 10%) - -//=Alerts -=alert($color) - color: #fff - background-color: $color - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.25) - border-color: darken($color, 25%) - h4 - color: darken($color, 20%) - -.alert - +alert($warning) - -.alert-success - +alert($success) - -.alert-error - +alert($error) - -.alert-info - +alert($info) - -//=Modals - -.modal - background-color: #444 - -.modal-header - border-bottom: 1px solid #222 - -.modal-body p - color: $color - -.modal-footer - background-color: darken(#444444, 5%) - border-top: 1px solid #222 - +box-shadow(0 1px 0 #333333 inset) - -//=Progress bars -.progress - @extend .well - -//=Misc ======================================== -blockquote - border-left-color: #111 - &.pull-right - border-right-color: #111 - -hr - +horizontal-rule-dark - border-top: none - -code - @extend .well - border: none - //over bs - -pre - @extend .well - border: none - //over bs - color: $color diff --git a/app/assets/stylesheets/user/wood1/header.css.sass b/app/assets/stylesheets/user/wood1/header.css.sass deleted file mode 100644 index 193515a2..00000000 --- a/app/assets/stylesheets/user/wood1/header.css.sass +++ /dev/null @@ -1,20 +0,0 @@ -.supplier-info-row - clear: right -.supplier-orders-in-process-count - background-image: image-url('icons/order-check.png') - padding-left: 20px - padding-right: 6px -.supplier-orders-delivered-count - background-image: image-url('icons/order-doublecheck.png') - padding-left: 28px -.supplier-orders-placed-count - background-image: image-url('icons/orders-queue.png') - padding-left: 22px - padding-right: 6px - //padding-top: 4px - //padding-top: 4px -.top-button-bar - .counter - display: inline - background-repeat: no-repeat - background-position: left center diff --git a/app/assets/stylesheets/user/wood1/list_products.css.sass b/app/assets/stylesheets/user/wood1/list_products.css.sass deleted file mode 100644 index 6f49286f..00000000 --- a/app/assets/stylesheets/user/wood1/list_products.css.sass +++ /dev/null @@ -1,12 +0,0 @@ -@import compass -@import ./constants -#products-table - .order-product-button - +wood-button - color: white -button.order-selected-products - color: white - background-color: $green -.product_order-remove-button - padding: 2px 5px - background-color: #bbb diff --git a/app/assets/stylesheets/user/wood1/mixins.sass b/app/assets/stylesheets/user/wood1/mixins.sass deleted file mode 100644 index 33c19ef5..00000000 --- a/app/assets/stylesheets/user/wood1/mixins.sass +++ /dev/null @@ -1,41 +0,0 @@ -=placeholder($color: $input-placeholder) - \:-moz-placeholder - color: $color - \::-webkit-input-placeholder - color: $color - -=controls($color) - & > label, - .help-block, - .help-inline - color: $color - input, select, textarea - //color: lighten($color, 20%); - color: $color - border-color: $color - input:focus, - select:focus, - textarea:focus - border-color: $color - +box-shadow(0 0 6px $color) - -=inset-panel-dark - +box-shadow(rgba(white, 0.1) 0 1px 0, rgba(black, 0.8) 0 1px 7px 0px inset) - background: darken(#2f2f2f, 6) - background-color: rgba(black, 0.3) - -=horizontal-rule-dark - +box-shadow(rgba(white, 0.07) 0 1px 0) - border-bottom: 1px solid #121212 - -=horizontal-rule-top-dark - +box-shadow(rgba(white, 0.07) 0 1px 0 inset) - border-top: 1px solid #121212 - -=vertical-rule-dark - +box-shadow(rgba(white, 0.07) 1px 0 0) - border-right: 1px solid #121212 - -=vertical-rule-left-dark - +box-shadow(rgba(white, 0.07) 1px 0 0 inset) - border-left: 1px solid #121212 diff --git a/app/assets/stylesheets/user/wood1/qr_list.css.sass b/app/assets/stylesheets/user/wood1/qr_list.css.sass deleted file mode 100644 index 32a34089..00000000 --- a/app/assets/stylesheets/user/wood1/qr_list.css.sass +++ /dev/null @@ -1,9 +0,0 @@ -#qr-list - margin: 0 - list-style: none - li - list-style: none - margin-bottom: 8px - .qr-image - background-color: white - display: block diff --git a/app/assets/stylesheets/user/wood1/side_menu.css.sass b/app/assets/stylesheets/user/wood1/side_menu.css.sass deleted file mode 100644 index 2f0def38..00000000 --- a/app/assets/stylesheets/user/wood1/side_menu.css.sass +++ /dev/null @@ -1,23 +0,0 @@ -@import ./constants -@import font-awesome -#toggle-side-menu - position: absolute - width: 28px - height: 28px - color: white - span - @extend .fa - @extend .fa-bars - @extend .fa-lg -#side-menu-container - background-color: #444 - position: fixed - display: none - left: 0 - top: 0 - width: 0 - height: 100% - > ul - list-style: none - a - color: white diff --git a/app/assets/stylesheets/user/wood1/structure.css.sass b/app/assets/stylesheets/user/wood1/structure.css.sass deleted file mode 100644 index 28c989ae..00000000 --- a/app/assets/stylesheets/user/wood1/structure.css.sass +++ /dev/null @@ -1,136 +0,0 @@ -@import compass -@import ./constants -@import font-awesome - -.fa-menu - @extend .fa-cutlery -html - background-image: $wood - background-color: $background-brown -body - padding-left: $side-spacing - padding-right: $side-spacing - //background-image: image-url('textures/wood6.png') - background-color: transparent - .home-panel - margin-left: 20px - margin-right: 20px - margin-top: 16px - +box-shadow(#000 10px 10px 16px) - background-color: rgba(240, 240, 240, 0.6) - +border-radius(10px) - .home-header - padding-top: 14px - padding-bottom: 8px - text-align: center - //background-color: #eee - //+border-top-radius(10px) - //+opacity(0.7) - min-height: 100px - .home-center - padding: 10px - text-align: center - background-color: black - .home-footer - //background-color: #eee - //+border-bottom-radius(10px) - //+opacity(0.7) - min-height: 42px - .home-footer-content - margin-top: 5px - margin-left: auto - margin-right: auto - width: 262px - text-align: center - a - +user-button - float: none - display: none - width: 34px - height: 34px - &.active - display: inline-block - span - display: block - width: 28px - height: 26px - background-repeat: no-repeat - background-position: center center - margin: 4px auto auto auto - &.home-list-link - span - background-image: image-url('icons/list.png') - &.home-menu-link - span - background-image: image-url('icons/menu.png') - //padding-top: 50px - .navbar-fixed-top - margin-left: -$side-spacing - margin-right: -$side-spacing - margin-bottom: 3px - .page-header - margin-top: 4px - margin-bottom: 6px - padding-bottom: 0 - .order-product-count - width: 30px - text-align: right - margin-bottom: 0 - .order-count-cell - white-space: nowrap - .page-header - #top-navigation-list - .locale - padding-left: 30px - background-repeat: no-repeat - background-position: 15px center - &.locale-en - background-image: image-url('flags/flag-en.png') - &.locale-nl - background-image: image-url('flags/flag-nl.png') -#list-needs-help-button - button - margin-left: 5px - i - padding-left: 5px -#list-needs-payment-button - button - margin-left: 5px - i - padding-left: 5px -.user-top-button - +user-button - span - display: block - width: 28px - height: 28px - background-position: center center - background-repeat: no-repeat - line-height: 28px -.top-button-bar - +button-bar - height: 90px - .button-bar-content - padding-top: 10px - .supplier-name - float: right - margin-right: 8px - .table-number - float: right - //#show-active-list - span - background-image: image-url('icons/list.png') - #place-order-on-list - span - background-image: image-url('icons/menu.png') - #list-needs-payment-button - //span - //background-image: image-url('icons/needs-payment.png') - &.active - span.fa - @extend .fa-spin - //background-image: image-url('icons/needs-payment-active.png') - #list-needs-help-button - &.active - span.fa - @extend .fa-spin diff --git a/app/views/layouts/theme1-home.html.slim b/app/views/layouts/theme1-home.html.slim index 82445b5d..bb1c6e3f 100644 --- a/app/views/layouts/theme1-home.html.slim +++ b/app/views/layouts/theme1-home.html.slim @@ -43,14 +43,15 @@ html lang="en" .container .content-top .main-inner - - if flash[:alert].present? - .alert.alert-error - a.close data-dismiss="alert" × - div= flash[:alert] - - if flash[:notice].present? - .alert.alert-success - a.close data-dismiss="alert" × - div= flash[:notice] + .general-alerts + - if flash[:alert].present? + .alert-box.warning + div= flash[:alert] + a.close data-dismiss="alert" × + - if flash[:notice].present? + .alert-box + div= flash[:notice] + a.close data-dismiss="alert" × = yield :page_title = yield #footer-wrap diff --git a/bin/build_mobile_app.rb b/bin/build_mobile_app.rb index 87b42759..7b89e747 100644 --- a/bin/build_mobile_app.rb +++ b/bin/build_mobile_app.rb @@ -78,6 +78,10 @@ for action in uc.action_methods android_view.gsub! /(href|src)="([^#])/, %|\\1="#{android_root_url}\\2| # replace relative uri's with android specific one android_view.sub! /<\/title>/, '' android_view.gsub! '##assets_path##', 'file:///android_asset/assets/' + if testhost = ENV['TEST_HOST'].presence + android_view.gsub! /data.qwaiter.com|www.qwaiter.com/, "#{testhost}:3000" + android_view.gsub! /events.qwaiter.com/, "#{testhost}:9296" + end # write to android path File.open(File.join(android_root, "#{action}.html"), 'w'){|f| f.puts android_view} end diff --git a/make_mobile b/make_mobile index 240265e7..5c1d73ad 100755 --- a/make_mobile +++ b/make_mobile @@ -1,4 +1,4 @@ #!/usr/bin/env bash rm -rf public/assets; -QWAITER_MOBILE_EXPORT=yes RAILS_ENV=production bundle exec rake assets:precompile; -QWAITER_MOBILE_EXPORT=yes RAILS_ENV=production bundle exec rails runner script/build_mobile_app.rb +QWAITER_MOBILE_EXPORT=yes RAILS_ENV=production bundle exec rake assets:precompile; +QWAITER_MOBILE_EXPORT=yes RAILS_ENV=production TEST_HOST=$1 bundle exec rails runner bin/build_mobile_app.rb;