Device Specific CSS + Bug Fixes (Feature Badge + Article Rating remove. Minor Fix + Margin Padding)

Author: hiteshaggarwal

astroid/astroid-framework/assets/css/astroid-menu-options.css

@@ -184,18 +184,44 @@ astroidFramework.directive("astroidspacing", ["$http", function ($http) {
                ['top', 'right', 'bottom', 'left', 'unit'].forEach(function (_prop) {
                   $element.find('[data-device=' + _device + '][data-attr=' + _prop + ']').val(_value[_device][_prop]);
                });
+               if (_value[_device].lock) {
+                  $element.find('button[data-device=' + _device + ']').removeClass('btn-light').addClass('btn-purple').addClass('active');
+               } else {
+                  $element.find('button[data-device=' + _device + ']').removeClass('btn-purple').removeClass('active').addClass('btn-light');
+               }
+
+               if (_value[_device].lock) {
+                  ['right', 'bottom', 'left'].forEach(function (_prop) {
+                     $element.find('input[data-device=' + _device + '][data-attr=' + _prop + ']').prop('disabled', true);
+                  });
+               } else {
+                  ['right', 'bottom', 'left'].forEach(function (_prop) {
+                     $element.find('input[data-device=' + _device + '][data-attr=' + _prop + ']').prop('disabled', false);
+                  });
+               }
+
             });
 
          }, 100);
 
+         $scope.setDevice = function (_device) {
+            $element.find('a').removeClass('active');
+            $element.find('a[data-device=' + _device + ']').addClass('active');
+            $element.find('.astroid-spacing-field').addClass('d-none');
+            $element.find('.astroid-spacing-field[data-device=' + _device + ']').removeClass('d-none');
+         }
+
+         $scope.setDevice('desktop');
+
          $scope.updateInput = function (_input) {
             var _device = _input.data('device');
             var _attr = _input.data('attr');
             _value[_device][_attr] = _input.val();
             if (_attr == 'top' && _value[_device].lock) {
                var _topVal = _value[_device][_attr];
-               ['right', 'bottom', 'left', 'unit'].forEach(function (_prop) {
+               ['right', 'bottom', 'left'].forEach(function (_prop) {
                   $element.find('input[data-device=' + _device + '][data-attr=' + _prop + ']').val(_topVal);
+                  _value[_device][_prop] = _topVal;
                });
             }
             $element.find('textarea').val(JSON.stringify(_value));
@@ -215,23 +241,29 @@ astroidFramework.directive("astroidspacing", ["$http", function ($http) {
 
          $scope.switchLock = function (_device) {
             _value[_device].lock = !_value[_device].lock;
-            $element.find('textarea').val(JSON.stringify(_value));
             $scope.updateLock(_device);
          }
 
          $scope.updateLock = function (_device) {
             if (_value[_device].lock) {
                var _topVal = $element.find('input[data-device=' + _device + '][data-attr=top]').val();
-               ['right', 'bottom', 'left', 'unit'].forEach(function (_prop) {
+               ['right', 'bottom', 'left'].forEach(function (_prop) {
                   $element.find('input[data-device=' + _device + '][data-attr=' + _prop + ']').val(_topVal);
                   $element.find('input[data-device=' + _device + '][data-attr=' + _prop + ']').prop('disabled', true);
+                  _value[_device][_prop] = _topVal;
                });
                $element.find('input[data-device=' + _device + '][data-attr=top]').focus();
             } else {
-               ['right', 'bottom', 'left', 'unit'].forEach(function (_prop) {
+               ['right', 'bottom', 'left'].forEach(function (_prop) {
                   $element.find('input[data-device=' + _device + '][data-attr=' + _prop + ']').prop('disabled', false);
                });
             }
+            if (_value[_device].lock) {
+               $element.find('button[data-device=' + _device + ']').removeClass('btn-light').addClass('btn-purple').addClass('active');
+            } else {
+               $element.find('button[data-device=' + _device + ']').removeClass('btn-purple').removeClass('active').addClass('btn-light');
+            }
+            $element.find('textarea').val(JSON.stringify(_value));
          }
       }
    }

astroid/astroid-framework/assets/css/astroid-menu-options.css.map

@@ -31,11 +31,11 @@ function __construct($article, $categoryView = false)
 
       $mainframe = JFactory::getApplication();
       $this->params = new JRegistry();
-      $itemId = $mainframe->input->get('Itemid', 0);
+      $itemId = $mainframe->input->get('Itemid', 0, 'INT');
       if ($itemId) {
          $menu = $mainframe->getMenu();
          $item = $menu->getItem($itemId);
-         if ($item->query['option'] == 'com_content' && ($item->query['view'] == 'category' || $item->query['view'] == 'article')) {
+         if ($item->query['option'] == 'com_content' && ($item->query['view'] == 'category' || $item->query['view'] == 'article' || $item->query['view'] == 'featured')) {
             $this->params = $item->params;
          }
       }
@@ -334,10 +334,12 @@ public function showRating()
          return FALSE;
       }
 
-      $menu_level = $this->params->get('article_rating', '');
-      $article_level = $this->article->params->get('article_rating', '');
+      if (!$this->article->params->get('show_vote', 0)) {
+         return FALSE;
+      }
+
       $astroid_level = $this->template->params->get('article_rating', 1);
-      return $this->checkPriority('', $article_level, $astroid_level);
+      return $astroid_level ? true : false;
    }
 
    // Utility Functions