shoppe 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf3db0b97bbf3c8ffbb10215d2ade4c91a72309
-  data.tar.gz: 4a3b72f72a71894bc3e18117626e3e9ef2c5b0a0
+  metadata.gz: 94d4e04493d5264dbdab6f5cbe61f31cb2d8b0a2
+  data.tar.gz: 505d1cf11f0e0ef6d96cc1d6bb0175c55084ceb7
 SHA512:
-  metadata.gz: d3f888a60d9d4063d8c420c065ad47b06e988aaed658ac829026191dd25c55df72ccc0b5b6a7519f72f8de5ff9f56f32193a1610cbe3a1d43ec96c631671b404
-  data.tar.gz: f70e7da8d23d27daa8f5b71d4b6dcef1d1dacb3bbff030cb713267411b54530fa6e6d83473b744426914e12ef94540d31bf04c0aae8c9b82a32e39291b9d5171
+  metadata.gz: ff6a2d5f80a7390b150808b5c67f2b3f7321315b2f41a6b2fd117c3cfa81dbc183f04724a98543a9fc225353062ba97bbb0396d638f63056393624c4390c3f7d
+  data.tar.gz: 54dcd6b512c401ae38aa43cd8e3a4590e1495ccbd0539f2591a8a13ddf125ae822cc26cda9012758f9c900e88a14f452b65417acd1f7cca3ce90ba89fba606f8

data/app/assets/javascripts/shoppe/application.coffee

@@ -72,7 +72,7 @@ $ ->
 # Format money values to 2 decimal places
 #
 window.formatMoneyField = ->
-  value = $(this).val()
+  value = $(this).val().replace /,/, ""
   $(this).val(parseFloat(value).toFixed(2)) if value.length
 
 #
@@ -116,4 +116,4 @@ Mousetrap.stopCallback = -> false
 Mousetrap.bind 'escape', ->
   Nifty.Dialog.closeTopDialog()
   false
-  
+  

data/app/assets/stylesheets/shoppe/application.scss

@@ -33,14 +33,14 @@ nav.sidebar {
 		}
 		p { color:#fff; font-size:0.9em; margin-top:4px; }
 	}
-	
+
 	p.logged {
 		background:#5B6270;
 		padding:12px 20px;
 		color:#fff;
 		font-size:0.9em;
 	}
-	
+
 	ul {
 		li {
 			span.pending { float:right; font-size:0.9em;  font-weight:bold;background:#5B6270; color:#fff; padding:2px 10px; border-radius:16px; margin-top:9px; margin-right:10px;}
@@ -71,6 +71,7 @@ header.main {
 	height:85px;
 	background:#fff;
 	box-shadow: 0 0px 15px -2px rgba(0,0,0,0.2);
+	z-index: 1;
 	p.buttons { float:right; margin-top:27px; margin-right:35px;}
 	p.buttons a { margin-left:10px;}
 	h2 { margin-top:28px; margin-left:35px; font-size:2.0em; font-weight:300; color:#333; background-repeat:no-repeat; background-size:22px; background-position:0 5px; padding-left:32px;}
@@ -89,17 +90,17 @@ header.main {
 #content {
 	padding-left:200px;
 	padding-top:85px;
-	
+
 	section.main {
 		padding:35px;
 	}
-	
+
 	//
 	// flashes
 	//
 	#flash-notice { background:#21a3e0; padding:15px 35px; color:#fff; font-size:1.2em; font-weight:bold;}
 	#flash-alert { background:#e04e21; padding:15px 35px; color:#fff; font-size:1.2em; font-weight:bold;}
-	
+
 	//
 	// sub title
 	//
@@ -110,8 +111,8 @@ header.main {
 		padding:15px;
 		h3 { font-size:2.0em; font-weight:500;}
 	}
-		
-	
+
+
 	//
 	// Status tags
 	//
@@ -129,7 +130,7 @@ header.main {
 		&.rejected { color:#E33127; background-image:image-url('shoppe/statuses/rejected.svg'); }
 		&.received { color:#909091; background-image:image-url('shoppe/statuses/received.svg'); }
 	}
-	
+
 	//
 	// fieldset
 	//
@@ -143,7 +144,7 @@ header.main {
 		&.padded { padding:15px 25px 25px 25px;}
 		&.padded legend { margin:0;}
 	}
-	
+
 	//
 	// forms
 	//
@@ -152,8 +153,8 @@ header.main {
 
 			.splitContainer { margin:0 25px; margin-bottom:15px; height:50px;}
 			.splitContainer:last-child { margin-bottom:0;}
-			
-			dl { 
+
+			dl {
 				margin:0 25px;
 				margin-bottom:15px;
 				&:last-child { margin-bottom:0;}
@@ -179,7 +180,7 @@ header.main {
 					float:left;
 					&:last-child { float:right;}
 				}
-				
+
 				&.third {
 					width:31%;
 					margin:0;
@@ -187,8 +188,23 @@ header.main {
 					&:nth-child(2) { margin-left:2%; width:32%;}
 					&:last-child { float:right; width:33%;}
 				}
+
+				&.quarter {
+					width:23%;
+					margin:0;
+					margin-left:2%;
+					float:left;
+					&:last-child { float:right; width:25%;}
+					&:first-child { margin:0;}
+				}
+
+				&.three-quarter {
+					width:75%;
+					margin:0;
+					float:right;
+				}
 			}
-			
+
 			dl.sided {
 				clear:both;
 				dt { float:left; width:25%; text-align:right; padding-top:4px;}
@@ -196,13 +212,13 @@ header.main {
 				dd p.help { margin-top:10px;}
 				dd div.checkbox { padding-top:5px;}
 			}
-			
-			
+
+
 			//
 			// margined container
 			//
 			div.margin { margin: 0 25px;}
-			
+
 			//
 			// attributes table
 			//
@@ -210,7 +226,10 @@ header.main {
 				width:100%;
 				margin-bottom:10px;
 				line-height:1.0;
-				thead td { background:#f7f7f7; color:#999; font-size:0.9em;}
+				thead td, thead th { text-align:left; border:1px solid #ccc; background:#f7f7f7; color:#999; font-size:0.9em; padding:10px; }
+				tr:nth-child(even) td {
+					background:#fbfbfb;
+				}
 				td {
 					border:1px solid #ccc;
 					padding:10px;
@@ -222,11 +241,35 @@ header.main {
 					&.handle { width:4%; background:image-url('shoppe/move.svg') no-repeat center; background-size:16px;}
 				}
 			}
+
+			//
+			// imports example table
+			//
+			table.importExample {
+				@extend table.productAttributes;
+				tr:nth-last-child(2) td {
+					border-bottom: none;
+				}
+				tr.tear-off td {
+					border:none;
+					background:image-url('shoppe/table-tear-off.png') repeat-x 0 0;
+					height:5px;
+					padding:0;
+				}
+				td {
+					border:1px solid #ddd;
+					font-size:0.9em;
+					width:auto;
+				}
+			}
 		}
 		p.submit {margin:0; background:#fff; border:1px solid #dce2eb; padding:25px; }
-		p.submit .button { margin-right:5px;}
+		p.submit .button {
+			margin-right:5px;
+			vertical-align: middle;
+		}
 		p.submit .right .button {margin-left:5px; margin-right:0;}
-		p.submit span.right { float:right;}
+		p.submit span.right {float:right;}
 		p.submit.sided { padding-left:30%;}
 		.errorExplanation {
 	    margin-bottom:25px;
@@ -239,7 +282,7 @@ header.main {
 	    ul li { list-style:disc; margin-left:25px; font-size:1.2em;}
 	  }
 	}
-	
+
 	//
 	// attachment preview
 	//
@@ -260,7 +303,7 @@ header.main {
 		div.desc a { color:#000;}
 		div.desc.none { color:#999; font-style:italic;}
 	}
-	
+
 	//
 	// order summary page
 	//
@@ -279,22 +322,22 @@ header.main {
 				p.ship { text-align:center; margin-top:22px;}
 				p.ship input[type=text] {  }
 			}
-			
+
 			dl {
 				dt { float:left; width:30%; text-align:right; color:#888;white-space:nowrap}
 				dd { font-weight:bold; margin-left:35%; margin-bottom:6px; white-space:nowrap}
 				dd a { color:inherit;}
 				dt.padding { padding-top:6px;}
 			}
-			
+
 			dl.form {
 				margin-top:15px;
 				input.text { width:70%;}
 				a.button { margin-right:5px;}
 			}
-			
+
 		}
-		
+
 		.status-bar {
 			background:image-url('shoppe/square.svg') repeat-x 0 15px;
 			background-size:8px;
@@ -315,7 +358,7 @@ header.main {
 				li.rejected h4 { color: #E33127}
 			}
 		}
-		
+
 		.order_items {
 			table.data {
  				.money { text-align:right; width:8%}
@@ -325,7 +368,7 @@ header.main {
 			}
 		}
 	}
-	
+
 	//
 	// warning message
 	//
@@ -338,7 +381,7 @@ header.main {
 		margin-bottom:25px;
 		padding:15px;
 	}
-	
+
 	//
 	// payments
 	//
@@ -370,7 +413,7 @@ header.main {
 			margin-bottom:15px;
 		}
 	}
-	
+
 	//
 	// order search
 	//
@@ -378,7 +421,7 @@ header.main {
 		overflow:hidden;
 		display:none;
 		dl.left, dl.right {
-			float:left; 
+			float:left;
 			width:50%;
 			dt { float:left; width:40%; text-align:right; padding-top:3px; color:#888;}
 			dd { margin-left:44%; margin-bottom:15px;}
@@ -396,7 +439,7 @@ header.main {
 		input[type=text].disabled { background:#f7f7f7; color:#888}
 		p.slaWarning {
 			background:#e5eaf4;
-			padding:15px;	
+			padding:15px;
 			border:1px solid #abb4c6;
 			border-top:0;
 			text-align:center;
@@ -419,11 +462,11 @@ header.main {
 			tfoot {
 				td input { width:100%;padding:3px; background:transparent; border:0; font-size:1.0em; color:#fff;}
 			}
-			
+
 		}
 	}
-	
-	
+
+
 }
 
 footer {
@@ -431,7 +474,7 @@ footer {
 	bottom:0;
 	width:200px;
 	background:rgba(0,0,0,0.05);
-	
+
 	p.store {
 		a {
 			display:block;
@@ -506,7 +549,7 @@ table.data {
 			td:last-child { border-right-width:0;}
 			tr:last-child td { border-bottom-width:0;}
 		}
-	} 
+	}
 	tbody tr.form {
 		td { background:#f2f6fb;}
 		input[type=text] { border:1px solid #CFD4DD; padding:5px;}
@@ -539,4 +582,4 @@ nav.pagination {
 			text-decoration:none;
 		}
 	}
-}
+}

data/app/assets/stylesheets/shoppe/elements.scss

@@ -27,7 +27,7 @@
     border-bottom-color:#86a350;
     &:active { background-color:#A8D750}
   }
-  
+
   &.loading {
     background-image:url(/images/spinners/button-green.gif);
     background-repeat:no-repeat;
@@ -56,7 +56,6 @@
     &:active { background:#888}
   }
 
-
 	&.white {
 		background-color:#fff;
 		color:#333 !important;

data/app/controllers/shoppe/attachments_controller.rb

@@ -1,14 +1,14 @@
 module Shoppe
   class AttachmentsController < Shoppe::ApplicationController
-  
+
     def destroy
       @attachment = Nifty::Attachments::Attachment.find(params[:id])
       @attachment.destroy
       respond_to do |wants|
-        wants.html { redirect_to request.referer, :notice => "Attachment removed successfully" }
+        wants.html { redirect_to request.referer, :notice => t('shoppe.attachments.remove_notice')}
         wants.json { render :status => 'complete' }
       end
     end
-  
+
   end
 end

data/app/controllers/shoppe/countries_controller.rb

@@ -1,47 +1,47 @@
 module Shoppe
   class CountriesController < Shoppe::ApplicationController
-  
+
     before_filter { @active_nav = :countries }
     before_filter { params[:id] && @country = Shoppe::Country.find(params[:id]) }
-  
+
     def index
       @countries = Shoppe::Country.ordered
     end
-  
+
     def new
       @country = Shoppe::Country.new
     end
-  
+
     def create
       @country = Shoppe::Country.new(safe_params)
       if @country.save
-        redirect_to :countries, :flash => {:notice => "Country has been created successfully"}
+        redirect_to :countries, :flash => {:notice => t('shoppe.countries.create_notice')}
       else
         render :action => "new"
       end
     end
-  
+
     def edit
     end
-  
+
     def update
       if @country.update(safe_params)
-        redirect_to [:edit, @country], :flash => {:notice => "Country has been updated successfully"}
+        redirect_to [:edit, @country], :flash => {:notice => t('shoppe.countries.update_notice') }
       else
         render :action => "edit"
       end
     end
-  
+
     def destroy
       @country.destroy
-      redirect_to :countries, :flash => {:notice => "Country has been removed successfully"}
+      redirect_to :countries, :flash => {:notice => t('shoppe.countries.destroy_notice')}
     end
-  
+
     private
-  
+
     def safe_params
       params[:country].permit(:name, :code2, :code3, :continent, :tld, :currency, :eu_member)
     end
-  
+
   end
 end

data/app/controllers/shoppe/delivery_service_prices_controller.rb

@@ -4,42 +4,42 @@ module Shoppe
     before_filter { @active_nav = :delivery_services }
     before_filter { @delivery_service = Shoppe::DeliveryService.find(params[:delivery_service_id])}
     before_filter { params[:id] && @delivery_service_price = @delivery_service.delivery_service_prices.find(params[:id])}
-  
+
     def index
       @delivery_service_prices = @delivery_service.delivery_service_prices.ordered
     end
-  
+
     def new
       @delivery_service_price = @delivery_service.delivery_service_prices.build
     end
-  
+
     def create
       @delivery_service_price = @delivery_service.delivery_service_prices.build(safe_params)
       if @delivery_service_price.save
-        redirect_to [@delivery_service, :delivery_service_prices], :notice => "Price has been created successfully"
+        redirect_to [@delivery_service, :delivery_service_prices], :notice => t('shoppe.delivery_service_prices.create_notice')
       else
         render :action => "new"
       end
     end
-  
+
     def update
       if @delivery_service_price.update(safe_params)
-        redirect_to [@delivery_service, :delivery_service_prices], :notice => "Price has been updated successfully"
+        redirect_to [@delivery_service, :delivery_service_prices], :notice => t('shoppe.delivery_service_prices.update_notice')
       else
         render :action => "edit"
       end
     end
-  
+
     def destroy
       @delivery_service_price.destroy
-      redirect_to [@delivery_service, :delivery_service_prices], :notice => "Price has been removed successfully"
+      redirect_to [@delivery_service, :delivery_service_prices], :notice => t('shoppe.delivery_service_prices.destroy_notice')
     end
-  
+
     private
-  
+
     def safe_params
       params[:delivery_service_price].permit(:price, :cost_price, :tax_rate_id, :min_weight, :max_weight, :code, :country_ids => [])
     end
-  
+
   end
 end