Tooskich · diadzine · Mar 6, 2016 · Mar 6, 2016 · Mar 6, 2016 · Mar 6, 2016
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@ node_modules
 dist
 .tmp
 .sass-cache
+.publish
 app/bower_components
+app/styles/main.css
diff --git a/app/index.html b/app/index.html
@@ -11,13 +11,10 @@
   <!-- Disabled responsive: <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> -->
   <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
 
-  <!-- build:css(.tmp) styles/main.css -->
+  <!-- build:css(app) styles/main.css -->
   <link rel="stylesheet" href="styles/main.css" />
-
   <link rel="stylesheet" href="bower_components/angular-loading-bar/build/loading-bar.css">
   <link rel="stylesheet" href="bower_components/angular-bootstrap-lightbox/dist/angular-bootstrap-lightbox.css">
-
-
   <!-- endbuild -->
 </head>
 <body ng-app="websiteApp">
@@ -35,9 +32,11 @@
       <center>
         <div style="max-width:1280px;">
 
-          <div ts-side-ads class="pull-left" style="margin-left:20px;" min-width="1280"></div>
+          <!-- Begin Ads -->
+          <div ts-ad-placeholder placeholder="sides" category="vertical" class="pull-left" style="margin-left:20px;" min-width="1280"></div>
 
-          <div ts-side-ads class="pull-right" style="margin-right:20px;" min-width="1175"></div>
+          <div ts-ad-placeholder placeholder="sides" category="vertical" class="pull-right" style="margin-right:20px;" min-width="1280"></div>
+          <!-- End Ads -->
 
           <!-- Add your site or application content here -->
           <div class="container">
@@ -66,13 +65,13 @@
       </script>
 
       <script src="bower_components/jquery/jquery.js"></script>
-      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.18/angular.min.js"></script>
-      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.18/angular-route.min.js"></script>
-      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.18/angular-resource.min.js"></script>
-      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.18/angular-cookies.min.js"></script>
-      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.18/angular-sanitize.min.js"></script>
-      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.18/angular-animate.min.js"></script>
-      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.18/angular-touch.min.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular.min.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular-route.min.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular-resource.min.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular-cookies.min.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular-sanitize.min.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular-animate.min.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular-touch.min.js"></script>
 
       <!-- build:js scripts/modules.js -->
       <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
@@ -83,7 +82,7 @@
       <script src="bower_components/angular-bootstrap-lightbox/dist/angular-bootstrap-lightbox.js"></script>
       <!-- endbuild -->
 
-      <!-- build:js({.tmp,app}) scripts/scripts.js -->
+      <!-- build:js(app) scripts/scripts.js -->
       <script src="scripts/app.js"></script>
       <script src="scripts/controllers/main.js"></script>
       <script src="scripts/controllers/mag.js"></script>
@@ -93,6 +92,7 @@
       <script src="scripts/directives/tsNewsCarousel.js"></script>
       <script src="scripts/controllers/news.js"></script>
       <script src="scripts/directives/tsPubSide.js"></script>
+      <script src="scripts/directives/tsAdPlaceholder.js"></script>
       <script src="scripts/directives/tsComments.js"></script>
       <script src="scripts/services/news.js"></script>
       <script src="scripts/directives/tsNavbar.js"></script>

diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -28,10 +28,10 @@ angular
                     templateUrl: 'views/news.html',
                     controller: 'NewsCtrl'
                 })
-                .when('/Rankings', {
-                    templateUrl: 'views/rankings.html',
-                    controller: 'RankingsCtrl'
-                })
+                //.when('/Rankings', {
+                //    templateUrl: 'views/rankings.html',
+                //    controller: 'RankingsCtrl'
+                //})
                 .when('/Blog', {
                     templateUrl: 'views/blog.html',
                     controller: 'BlogCtrl'
@@ -40,10 +40,10 @@ angular
                     templateUrl: 'views/page.html',
                     controller: 'PageCtrl'
                 })
-                .when('/Result', {
-                    templateUrl: 'views/result.html',
-                    controller: 'ResultCtrl'
-                })
+                //.when('/Result', {
+                //    templateUrl: 'views/result.html',
+                //    controller: 'ResultCtrl'
+                //})
                 .when('/Skiclubs', {
                     templateUrl: 'views/skiclubs.html',
                     controller: 'SkiclubsCtrl'

diff --git a/app/scripts/controllers/result.js b/app/scripts/controllers/result.js
@@ -19,6 +19,14 @@ angular.module('websiteApp')
                     .html(result.table)
                     .find('table')
                     .addClass('table table-striped table-condensed');
+                // Hack to hide 'FIS Code' column
+                if (angular.element('#table-content tr:first() th').length > 8) {
+                    var fis = angular.element('#table-content th:contains("FIS Code")');
+                    var index = fis.parent().children().index(fis);
+                    angular.element('#table-content tr').find('th:nth(' + index + ')').hide();
+                    angular.element('#table-content tr').find('td:nth(' + index + ')').hide();
+                }
+
             });
         }
     ]);
diff --git a/app/scripts/controllers/sponsors.js b/app/scripts/controllers/sponsors.js
@@ -8,8 +8,10 @@
  * Controller of the websiteApp
  */
 angular.module('websiteApp')
-  .controller('SponsorsCtrl', function ($scope, Widget) {
-        Widget.get(2, function(widget) {
-            $scope.widgetContent = widget;
-        });
-  });
+    .controller('SponsorsCtrl', ['$scope', 'Widget',
+        function ($scope, Widget) {
+            Widget.get(2, function(widget) {
+                $scope.widgetContent = widget;
+            });
+        }
+    ]);
diff --git a/app/scripts/directives/tsAdPlaceholder.js b/app/scripts/directives/tsAdPlaceholder.js
@@ -0,0 +1,42 @@
+'use strict';
+
+angular.module('websiteApp')
+    .directive('tsAdPlaceholder', ['$window', 'Pub',
+        function($window, Pub) {
+            return {
+                templateUrl: 'views/directives/core/placeholder.html',
+                restrict: 'EACM',
+                replace: true,
+                scope: {
+                    width: '=?minWidth',
+                },
+                link: function postLink(scope, element, attrs) {
+
+                    var checkWidth = function(width) {
+                        var width = width;
+                        return function() {
+                            if (width >= window.innerWidth) {
+                                element.css('display', 'none');
+                            }
+                            else {
+                                element.css('display', 'block');
+                            }
+                        };
+                    };
+                    checkWidth = checkWidth(scope.width);
+                    checkWidth();
+
+                    var pubs = Pub.getPlaceholder(
+                        attrs.placeholder,
+                        attrs.category,
+                        function (pubs) {
+                            scope.ad = pubs[0];
+                            scope.cat = attrs.category;
+                        }
+                    );
+
+                    angular.element($window).on('resize', checkWidth);
+                }
+            };
+        }
+    ]);
diff --git a/app/scripts/directives/tssideads.js b/app/scripts/directives/tssideads.js
@@ -1,41 +1,43 @@
 'use strict';
 
 angular.module('websiteApp')
-    .directive('tsSideAds', function($window, Pub) {
-        return {
-            templateUrl: 'views/directives/core/sideads.html',
-            restrict: 'EACM',
-            scope: {
-                width: '=minWidth',
-            },
-            link: function postLink(scope, element, attrs) {
-                function shuffle(o) { //v1.0
-                    for (var j, x, i = o.length; i; j = Math.floor(Math.random() *
-                        i), x = o[--i], o[i] = o[j], o[j] = x);
-                    return o;
-                };
+    .directive('tsSideAds', ['$window', 'Pub',
+        function($window, Pub) {
+            return {
+                templateUrl: 'views/directives/core/sideads.html',
+                restrict: 'EACM',
+                scope: {
+                    width: '=minWidth',
+                },
+                link: function postLink(scope, element, attrs) {
+                    function shuffle(o) { //v1.0
+                        for (var j, x, i = o.length; i; j = Math.floor(Math.random() *
+                            i), x = o[--i], o[i] = o[j], o[j] = x);
+                        return o;
+                    };
 
-                var checkWidth = function(width) {
-                    var width = width;
-                    return function() {
-                        if (width >= window.innerWidth) {
-                            element.css('display', 'none');
-                        }
-                        else {
-                            element.css('display', 'block');
-                        }
+                    var checkWidth = function(width) {
+                        var width = width;
+                        return function() {
+                            if (width >= window.innerWidth) {
+                                element.css('display', 'none');
+                            }
+                            else {
+                                element.css('display', 'block');
+                            }
+                        };
                     };
-                };
-                checkWidth = checkWidth(scope.width);
-                checkWidth();
+                    checkWidth = checkWidth(scope.width);
+                    checkWidth();
 
-                Pub.getVerticalBanner(function(banners) {
-                    scope.ad = shuffle(banners)[0];
-                });
+                    Pub.getVerticalBanner(function(banners) {
+                        scope.ad = shuffle(banners)[0];
+                    });
 
 
-                angular.element($window)
-                    .on('resize', checkWidth);
-            }
-        };
-    });
+                    angular.element($window)
+                        .on('resize', checkWidth);
+                }
+            };
+        }
+    ]);
diff --git a/app/scripts/services/pub.js b/app/scripts/services/pub.js
@@ -14,6 +14,15 @@ angular.module('websiteApp')
 
             return {
 
+                getPlaceholder: function(placeholder, cat, callback) {
+                    $http.get(pubApi + '?placeholder=' + placeholder + '&category=' + cat, {
+                        cache: true
+                    }).then(function(res) {
+                        var data = shuffleArray(res.data);
+                        callback(data);
+                    }, Server.errorHandler);
+                },
+
                 getCat: function(cat, callback) {
                     $http.get(pubApi + '?category=' + cat, {
                         cache: true

diff --git a/app/scripts/services/server.js b/app/scripts/services/server.js
@@ -1,32 +1,33 @@
 'use strict';
 
 angular.module('websiteApp')
-    .service('Server', function Server($window, $location) {
-        // AngularJS will instantiate a singleton by calling "new" on this function
+    .service('Server', ['$window', '$location',
+        function Server($window, $location) {
+            // AngularJS will instantiate a singleton by calling "new" on this function
 
-        this.Url = 'http://tooski.webfactional.com/api/';
-        // this.Url = 'http://127.0.0.1:8000/';
+            this.Url = 'http://tooski.webfactional.com/api/';
 
-        this.sendAnalytics = function() {
-            $window.ga('send', 'pageview', {
-                page: $location.path()
-            });
-        };
+            this.sendAnalytics = function() {
+                $window.ga('send', 'pageview', {
+                    page: $location.path()
+                });
+            };
 
-        this.processResponse = function(response) {
-            return response.map(function(el) {
-                var result = el.fields;
-                result.id = el.pk;
-                result.date = new Date(result.date)
-                    .getTime();
-                return result;
-            });
-        };
+            this.processResponse = function(response) {
+                return response.map(function(el) {
+                    var result = el.fields;
+                    result.id = el.pk;
+                    result.date = new Date(result.date)
+                        .getTime();
+                    return result;
+                });
+            };
 
-        this.errorHandler = function(status, response) {
-            console.log(
-                'There was a connection problem with the server. (' +
-                status + ')'
-            );
+            this.errorHandler = function(status, response) {
+                console.log(
+                    'There was a connection problem with the server. (' +
+                    status + ')'
+                );
+            }
         }
-    });
+    ]);
diff --git a/app/styles/main.scss b/app/styles/main.scss
@@ -198,6 +198,18 @@ div.blue {
     padding-top:0px;
 }
 
+.sponsors-hl {
+    background-color: #eee;
+    color: #000;
+    padding: 10px;
+    margin: 20px 0 30px 0;
+    text-align: justify;
+
+    li {
+      margin: 20px 10px 20px 10px;
+    }
+}
+
 img {
     max-width:100%;
 }
@@ -213,3 +225,35 @@ article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,su
     font-weight: bold;
     background-color: $lightgray;
 }
+
+/***** ADS ****/
+$ads_categories: (
+  square: (
+    width: 300px,
+    height: 250px,
+  ),
+  vertical: (
+    width: 120px,
+    height: 600px,
+  ),
+  horizontal: (
+    width: 468px,
+    height: 90px,
+  ),
+);
+
+@each $category, $dimensions in $ads_categories {
+  .ad_block_#{$category} {
+    margin: 1px;
+
+    .ad_image_#{$category} {
+      @each $property, $value in $dimensions {
+        #{$property}: #{$value};
+      }
+    }
+  }
+}
+
+.ad_block_horizontal {
+  margin: 20px auto;
+}