main css conflict

front-ui/app/actions/navigationActions.js

@@ -1,21 +1,23 @@
 var AppDispatcher = require('../dispatcher/appDispatcher');
 var NavigationConstants = require('../constants/navigationConstants');
+var globals = require('../globals');
 
 // Define action methods
 var NavigationActions = {
+
   // select item
   goToItemDetails: function(item) {
     
     AppDispatcher.handleAction({
       actionType: NavigationConstants.CHANGE_URL,
-      url: '/artikal/' + item.get('id') +'/' + item.get('name')
+      url: '/artikal/' + item.get('id') +'/' + globals.Slugify(item.get('name'))
     });
   },
 
   goToSection: function(section) {
     AppDispatcher.handleAction({
       actionType: NavigationConstants.CHANGE_URL,
-      url: '/sekcija/'+ section.get('id') + '/' + section.get('name')
+      url: '/sekcija/'+ section.get('id') + '/' + globals.Slugify(section.get('name'))
     });
   },
   _getQueryStringPart: function(query, offset, limit) {
@@ -46,7 +48,7 @@ var NavigationActions = {
   },
 
   goToCategory: function(category,section, query, offset, limit) {
-    var url ='/sekcija/' + section.get('name') +'/kategorija/'+ category.get('id') + '/' + category.get('name');
+    var url ='/sekcija/' + section.get('name') +'/kategorija/'+ category.get('id') + '/' +  globals.Slugify(category.get('name'));
     var q = this._getQueryStringPart(query, offset, limit);
     AppDispatcher.handleAction({
       actionType: NavigationConstants.CHANGE_URL,
@@ -56,7 +58,7 @@ var NavigationActions = {
 
   goToSubCategory: function(subCategory, offset, limit, query) {
       var q = this._getQueryStringPart(query, offset, limit);
-      var url = '/podkategorija/' + subCategory.get('id') + '/' + subCategory.get('name');
+      var url = '/podkategorija/' + subCategory.get('id') + '/' +  globals.Slugify(subCategory.get('name'));
     AppDispatcher.handleAction({
       actionType: NavigationConstants.CHANGE_URL,
       url: (url  + q)

front-ui/app/components/about/newsletterSweepstake.js

@@ -0,0 +1,40 @@
+var React = require('react'),
+    CartStore = require('../../stores/cartStore'),
+    AddToCart = require('../cart/addToCart'),
+    CartActions = require('../../actions/cartActions'),
+    LinkBanner = require('../linkBanner/linkBanner'),
+    NavigationActions = require('../../actions/navigationActions'),
+    Globals = require('../../globals')
+    Router = require("react-router"),
+    Link = Router.Link;
+
+
+var NewsletterSweepstake = React.createClass({
+
+    render: function() {
+
+      return (
+
+        <div className="center">
+        <h1 className="normal-message">Novosti i sniženja</h1>
+           <p className="normal-message">Prijavite se na naše novosti i saznajte sve o najnovijim sniženjima i ponudama na Ribici!</p>
+
+<p className="normal-message"><strong>I ovaj put - najsretnije očekuju vrijedne Disney Frozen nagrade!</strong> <br /></p>
+
+<p className="normal-message">Pobjednike objavljujemo u našim email novostima u Ponedjeljak, 7.12.2015. </p>
+
+
+<p style={{"textAlign": "center"}}>
+<iframe style={{"width": "100%", "height": "500px", "border": "0px", "overflow": "hidden"}} src="newsletter.html" />
+</p>
+
+
+
+</div>
+        );
+    }
+
+});
+
+
+module.exports = NewsletterSweepstake;

front-ui/app/css/main.css

@@ -487,3 +487,21 @@ line-height: 18.2px;
 width: 708px;
 word-wrap: break-word;
 }
+
+.message { 
+  font-size: 130%;
+  text-align: left;
+  margin-left: 20px;
+  margin-right: 20px; 
+
+
+}
+
+.normal-message { 
+  text-align: left;
+  margin-left: 20px;
+  margin-right: 20px; 
+
+
+}
+

front-ui/app/globals.js

@@ -4,12 +4,24 @@ module.exports = {
     ItemGroupIdOfStartPage: "1",
     ItemGroupIdOfEmptyCartPage: "1",
     FormatCurrency: function(amount_s) {
-    	var amount = parseFloat(amount_s);
-    	return ( amount.toFixed(2) + " KM" )
+        var amount = parseFloat(amount_s);
+        return (amount.toFixed(2) + " KM")
     },
     FormatPercentage: function(amount_s) {
-    	var amount = parseFloat(amount_s);
-    	return ( amount.toFixed(2) + "%" )
+        var amount = parseFloat(amount_s);
+        return (amount.toFixed(2) + "%")
     },
-    MaxNumberOfItemsToBeAdded: 1000
+    MaxNumberOfItemsToBeAdded: 1000,
+
+    Slugify: function(text) {
+        return text.toString().toLowerCase()
+            .replace(/š/g,'s')
+            .replace(/[čć]/g,'c')
+            .replace(/[ž]/g,'z')
+            .replace(/\s+/g, '-') // Replace spaces with -
+            .replace(/[^\w\-]+/g, '') // Remove all non-word chars
+            .replace(/\-\-+/g, '-') // Replace multiple - with single -
+            .replace(/^-+/, '') // Trim - from start of text
+            .replace(/-+$/, ''); // Trim - from end of text
+    }
 };

front-ui/app/router.js

@@ -18,6 +18,7 @@ var BySubCategory = require('./components/browsing/bySubCategory');
 var BySection = require('./components/browsing/bySection');
 var ThankYouPage = require('./components/thankyou/thankYouPage');
 var AboutUsPage = require('./components/about/aboutUsPage');
+var NewsletterSweepstake = require('./components/about/newsletterSweepstake');
 // var Register = require('./components/account/register');
 // var Login = require('./components/account/login');
 var SearchResultsPage = require('./components/search/searchResultsPage');
@@ -36,6 +37,7 @@ var routes = (
       <Route name='byCat' path="sekcija/:sekcijaName/kategorija/:id/*" handler={ByCategory} />
       <Route name='hvala' path="/hvala" handler={ThankYouPage} />
       <Route name='onama' path="/o-nama" handler={AboutUsPage} />
+      <Route name='newsletter' path="/email-novosti" handler={NewsletterSweepstake} />
       <Route name='pretraga' path="/pretraga" handler={SearchResultsPage} />
       <DefaultRoute handler={StartPage}/>
     </Route>

front-ui/app/stores/cartStore.js

@@ -530,12 +530,6 @@ var supportedPlaces = [{
         "code": "76233",
         "placeLabel": "Domaljevac"
     }
-
-    , {
-        "code": "88305",
-        "placeLabel": "Domanovici"
-    }
-
     , {
         "code": "76274",
         "placeLabel": "Donja Mahala"
@@ -716,11 +710,6 @@ var supportedPlaces = [{
         "placeLabel": "Glavicice"
     }
 
-    , {
-        "code": "72230",
-        "placeLabel": "Globarica"
-    }
-
     , {
         "code": "71275",
         "placeLabel": "Gojevici"
@@ -1356,11 +1345,6 @@ var supportedPlaces = [{
         "placeLabel": "Mala Socanica"
     }
 
-    , {
-        "code": "75320",
-        "placeLabel": "Malesici"
-    }
-
     , {
         "code": "76208",
         "placeLabel": "Maoca"
@@ -1451,26 +1435,6 @@ var supportedPlaces = [{
         "placeLabel": "Mostar"
     }
 
-    , {
-        "code": "88000",
-        "placeLabel": "Mostar, Jug"
-    }
-
-    , {
-        "code": "88000",
-        "placeLabel": "Mostar, Jugozapad"
-    }
-
-    , {
-        "code": "88000",
-        "placeLabel": "Mostar, Sjever"
-    }
-
-    , {
-        "code": "88000",
-        "placeLabel": "Mostar, Zapad"
-    }
-
     , {
         "code": "75212",
         "placeLabel": "Mramor"
@@ -1720,12 +1684,6 @@ var supportedPlaces = [{
         "code": "75303",
         "placeLabel": "Poljice"
     }
-
-    , {
-        "code": "75320",
-        "placeLabel": "Popovi"
-    }
-
     , {
         "code": "88240",
         "placeLabel": "Posusje"
@@ -1741,11 +1699,6 @@ var supportedPlaces = [{
         "placeLabel": "Potocani"
     }
 
-    , {
-        "code": "88208",
-        "placeLabel": "Potoci"
-    }
-
     , {
         "code": "73290",
         "placeLabel": "Praca"
@@ -2536,11 +2489,6 @@ var supportedPlaces = [{
         "placeLabel": "Zaborak"
     }
 
-    , {
-        "code": "72220",
-        "placeLabel": "Zabrdje"
-    }
-
     , {
         "code": "76333",
         "placeLabel": "Zabrdje"

front-ui/app/stores/itemStore.js

@@ -102,7 +102,7 @@ var fetchBestSellingItemsForGroup = function(groupId) {
     var items = _bestSellingForGroup;
     items.setClassificationType(4);
     items.setClassificationId(groupId);
-    items.setLimit(30);
+    items.setLimit(200);
     items.setOffset(0);
 
     items.fetch({