Skip to content

Commit

Permalink
Reverted Angular UI Bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
artem-dudarev committed Feb 8, 2016
1 parent 7ed026d commit fc42b14
Show file tree
Hide file tree
Showing 12 changed files with 213 additions and 119 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3712,7 +3712,7 @@ html[xmlns] .slides { display: block; }
background: $headerBackgroundTop;
height: 30px;
position: relative;
z-index: 999998;
z-index: 999999;
}

@include at-query ($max, $medium) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
var storefrontApp = angular.module('storefrontApp', ['ngRoute', 'ui.bootstrap']);
var storefrontApp = angular.module('storefrontApp', ['ngRoute']);

storefrontApp.factory('httpErrorInterceptor', ['$q', '$rootScope', function ($q, $rootScope) {
var httpErrorInterceptor = {};

httpErrorInterceptor.responseError = function (rejection) {
$rootScope.$broadcast('storefrontError', {
type: 'danger',
type: 'error',
title: rejection.data.message,
message: rejection.data.stackTrace
});
return $q.reject(rejection);
};
httpErrorInterceptor.requestError = function (rejection) {
$rootScope.$broadcast('storefrontError', {
type: 'danger',
type: 'error',
title: rejection.data.message,
message: rejection.data.stackTrace
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var storefrontApp = angular.module('storefrontApp');

storefrontApp.controller('productController', ['$scope', '$window', 'dialogService', 'catalogService', 'cartService', function ($scope, $window, dialogService, catalogService, cartService) {
storefrontApp.controller('productController', ['$scope', '$window', 'catalogService', function ($scope, $window, catalogService) {
//TODO: prevent add to cart not selected variation
// display validator please select property
// display price range
Expand All @@ -11,18 +11,6 @@ storefrontApp.controller('productController', ['$scope', '$window', 'dialogServi
$scope.productPrice = null;
$scope.productPriceLoaded = false;

$scope.addProductToCart = function (product, quantity) {
var dialogData = {
ImageUrl: product.PrimaryImage.Url,
ListPrice: product.Price.ListPrice,
Name: product.Name,
PlacedPrice: product.Price.ActualPrice,
Quantity: quantity
};
dialogService.showDialog(dialogData, 'recentlyAddedCartItemDialogController', 'storefront.recently-added-cart-item-dialog.tpl');
cartService.addLineItem(product.Id, quantity);
}

function Initialize() {
var productId = $window.products[0].id;
catalogService.getProduct(productId).then(function (response) {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
var storefrontApp = angular.module('storefrontApp');

storefrontApp.service('dialogService', ['$uibModal', function ($uibModal) {
return {
showDialog: function (dialogData, controller, templateUrl) {
var modalInstance = $uibModal.open({
controller: controller,
templateUrl: templateUrl,
resolve: {
dialogData: function () {
return dialogData;
}
}
});
}
}
}]);

storefrontApp.service('customerService', ['$http', function ($http) {
return {
getCurrentCustomer: function () {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
.toast-title {
font-weight: bold;
}
.toast-message {
-ms-word-wrap: break-word;
word-wrap: break-word;
}
.toast-message a,
.toast-message label {
color: #ffffff;
}
.toast-message a:hover {
color: #cccccc;
text-decoration: none;
}
.toast-close-button {
position: relative;
right: -0.3em;
top: -0.3em;
float: right;
font-size: 20px;
font-weight: bold;
color: #ffffff;
-webkit-text-shadow: 0 1px 0 #ffffff;
text-shadow: 0 1px 0 #ffffff;
opacity: 0.9;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=90);
filter: alpha(opacity=90);
}
.toast-close-button:hover,
.toast-close-button:focus {
color: #000000;
text-decoration: none;
opacity: 0.4;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=40);
filter: alpha(opacity=40);
}
/*Additional properties for button version
iOS requires the button element instead of an anchor tag.
If you want the anchor version, it requires `href="#"`.*/
button.toast-close-button {
padding: 0;
cursor: pointer;
background: transparent;
border: 0;
-webkit-appearance: none;
}
.toast-top-center {
top: 0;
right: 0;
width: 100%;
}
.toast-bottom-center {
bottom: 0;
right: 0;
width: 100%;
}
.toast-top-full-width {
top: 0;
right: 0;
width: 100%;
}
.toast-bottom-full-width {
bottom: 0;
right: 0;
width: 100%;
}
.toast-top-left {
top: 12px;
left: 12px;
}
.toast-top-right {
top: 12px;
right: 12px;
}
.toast-bottom-right {
right: 12px;
bottom: 12px;
}
.toast-bottom-left {
bottom: 12px;
left: 12px;
}
#toast-container {
position: fixed;
z-index: 999999;
pointer-events: none;
/*overrides*/
}
#toast-container * {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
#toast-container > div {
position: relative;
pointer-events: auto;
overflow: hidden;
margin: 0 0 6px;
padding: 15px 15px 15px 50px;
width: 300px;
-moz-border-radius: 3px 3px 3px 3px;
-webkit-border-radius: 3px 3px 3px 3px;
border-radius: 3px 3px 3px 3px;
background-position: 15px 20px;
background-repeat: no-repeat;
-moz-box-shadow: 0 0 12px #000000;
-webkit-box-shadow: 0 0 12px #000000;
box-shadow: 0 0 12px #000000; color: #ffffff;
opacity: 0.9;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=90);
filter: alpha(opacity=90);
}
#toast-container > :hover {
-moz-box-shadow: 0 0 12px #000000;
-webkit-box-shadow: 0 0 12px #000000;
box-shadow: 0 0 12px #000000;
opacity: 1;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
filter: alpha(opacity=100);
}
#toast-container > .toast-info {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=") !important;
}
#toast-container > .toast-error {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=") !important;
}
#toast-container > .toast-success {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==") !important;
}
#toast-container > .toast-warning {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=") !important;
}
#toast-container.toast-top-center > div,
#toast-container.toast-bottom-center > div {
width: 300px;
margin-left: auto;
margin-right: auto;
}
#toast-container.toast-top-full-width > div,
#toast-container.toast-bottom-full-width > div {
width: 96%;
margin-left: auto;
margin-right: auto;
}
.toast {
background-color: #030303;
}
.toast-success {
background-color: #51a351;
}
.toast-error {
background-color: #bd362f;
}
.toast-info {
background-color: #2f96b4;
}
.toast-warning {
background-color: #f89406;
}
.toast-progress {
position: absolute;
left: 0;
bottom: 0;
height: 4px;
background-color: #000000;
opacity: 0.4;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=40);
filter: alpha(opacity=40);
}
/*Responsive Design*/
@media all and (max-width: 240px) {
#toast-container > div {
padding: 8px 8px 8px 50px;
width: 11em;
}
#toast-container .toast-close-button {
right: -0.2em;
top: -0.2em;
}
}
@media all and (min-width: 241px) and (max-width: 480px) {
#toast-container > div {
padding: 8px 8px 8px 50px;
width: 18em;
}
#toast-container .toast-close-button {
right: -0.2em;
top: -0.2em;
}
}
@media all and (min-width: 481px) and (max-width: 768px) {
#toast-container > div {
padding: 15px 15px 15px 50px;
width: 25em;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@

{{ '//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css' | stylesheet_tag }}
{{ 'checkout.css' | global_asset_url | stylesheet_tag }}
<!--need for client notifications-->
{{ 'toastr.css' | asset_url | stylesheet_tag }}

<base href="{{ '/' | absolute_url }}" />

{{ '//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js' | script_tag }}
{{ '//ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular.min.js' | script_tag }}
{{ '//ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular-route.min.js' | script_tag }}
{{ '//ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular-sanitize.min.js' | script_tag }}
{{ '//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/1.1.2/ui-bootstrap-tpls.min.js' | script_tag }}
{{ 'storefrontApp.js' | global_asset_url | script_tag }}
{{ 'storefrontServices.js' | global_asset_url | script_tag }}
{{ 'storefrontDirectives.js' | global_asset_url | script_tag }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
{{ 'storefront.css' | asset_url | stylesheet_tag }}
{{ 'ideal-image-slider.css' | asset_url | stylesheet_tag }}
{{ 'ideal-image-slider-default-theme.css' | asset_url | stylesheet_tag }}

<!--need for client notifications-->
{{ 'toastr.css' | asset_url | stylesheet_tag }}
{% include 'google-fonts' %}

{{ content_for_header }}
Expand All @@ -43,10 +44,8 @@
{{ '//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js' | script_tag }}
{{ '//ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular.min.js' | script_tag }}
{{ '//ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular-route.min.js' | script_tag }}
{{ '//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/1.1.2/ui-bootstrap-tpls.min.js' | script_tag }}
{{ 'storefrontApp.js' | asset_url | script_tag }}
{{ 'storefrontServices.js' | asset_url | script_tag }}
{{ 'storefrontRecentlyAddedCartItemDialogController.js' | asset_url | script_tag }}
{{ 'storefrontDirectives.js' | asset_url | script_tag }}
{{ 'storefrontMainController.js' | asset_url | script_tag }}
{{ 'storefrontCartController.js' | asset_url | script_tag }}
Expand All @@ -59,8 +58,6 @@
{{ 'customer_area.js' | shopify_asset_url | script_tag }}
</head>
<body id="{{ page_title | handle }}" class="{% if customer %}customer-logged-in {% endif %}template-{{ template | replace: '.', ' ' | truncatewords: 1, '' | handle }}" ng-controller="mainController" ng-init="baseUrl='{{ '/' | absolute_url }}'">
{% include 'notification' %}
{% include 'recently-added-cart-item-dialog' %}
<span ng-controller="cartController">
{% if settings.store_selector_enable %}
{% include 'top-header-selector' %}
Expand Down Expand Up @@ -162,10 +159,13 @@
{{ content_for_layout }}
</main>
{% include 'footer' %}
{% include 'cart-modal' %}
{% if shop.quotes_enabled %}
{% include 'quote-modal' %}
{% endif %}
</span>
<!--need for client notifications-->
{% include 'notification' %}
<script>
window.quotesEnabled = {{ shop.quotes_enabled }};
</script>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
<style>
.alert {
left: 50%;
margin-left: -45%;
position: fixed;
top: 0;
width: 90%;
z-index: 999999;
}
</style>

<uib-alert templateUrl="alert.tpl" type="{( storefrontNotification.type )}" close="closeNotification()" ng-if="storefrontNotification" ng-cloak>
<strong ng-bind="storefrontNotification.title"></strong>
<p ng-bind="storefrontNotification.message"></p>
</uib-alert>

{% comment %}
<div class="toast-top-full-width" id="toast-container" ng-cloak ng-if="storefrontNotification">
<div class="toast-top-full-width" id="toast-container" ng-cloak ng-if="storefrontNotification">
<div class="toast toast-error" ng-if="storefrontNotification.type == 'error'">
<button class="toast-close-button" type="button" ng-click="closeNotification()">×</button>
<div class="toast-title">{{ 'notification.error_title' | t }}</div>
Expand All @@ -27,5 +10,4 @@
</a>
<div class="toast-message" style="margin-top: 20px;" ng-bind="storefrontNotification.message" ng-if="storefrontNotification.detailsVisible"></div>
</div>
</div>
{% endcomment %}
</div>
Loading

0 comments on commit fc42b14

Please sign in to comment.