Minor refactoring

Magenerds · Feb 6, 2017 · c337b28 · c337b28
1 parent b04ec5b
commit c337b28
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 80 deletions.
diff --git a/Block/Adminhtml/Dashboard.php b/Block/Adminhtml/Dashboard.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Magenerds\Dashboard\Block\AfterPrice
- *
  * Copyright (c) 2017 Magenerds
  * All rights reserved
  *
@@ -12,21 +10,14 @@
  * [email protected]
  */
 
-/**
- * @category   Magenerds
- * @package    Magenerds_Dashboard
- * @subpackage Block
- * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
- * @link       http://www.magenerds.com/
- * @author     Florian Sydekum <[email protected]>
- */
 namespace Magenerds\Dashboard\Block\Adminhtml;
 
 use Magento\Backend\Block\Template;
 
 /**
- * Class Dashboard
- * @package Magenerds\Dashboard\Block\Adminhtml
+ * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
+ * @link       http://www.magenerds.com/
+ * @author     Florian Sydekum <[email protected]>
  */
 class Dashboard extends Template
 {
@@ -62,19 +53,10 @@ public function getBlogFeeds()
 
         $ctr = 1;
         foreach ($reader->import(self::BLOG_FEED_URL) as $feed) {
-            $matches = [];
-            preg_match('/^src=".*\..{3}"/', $feed->getContent(), $matches);
-            $img = '';
-
-            if (count($matches)) {
-                $img = substr($matches[0], 4, strlen($matches[0]));
-            }
-
             $feeds[] = [
                 'link' => $feed->getLink(),
                 'title' => $feed->getTitle(),
                 'date' => substr($feed->getDateCreated(), 0, 10),
-                'image' => $img,
                 'description' => $feed->getDescription()
             ];
             if ($ctr == self::NUMBER_BLOG_FEEDS) break;
@@ -96,20 +78,11 @@ public function getNewsFeeds()
 
         $ctr = 1;
         foreach ($reader->import(self::NEWS_FEED_URL) as $feed) {
-            $matches = [];
-            preg_match('/^src=".*\..{3}"/', $feed->getContent(), $matches);
-            $img = '';
-
-            if (count($matches)) {
-                $img = substr($matches[0], 4, strlen($matches[0]));
-            }
-
             $feeds[] = [
                 'link' => $feed->getLink(),
                 'title' => $feed->getTitle(),
                 'date' => substr($feed->getDateCreated(), 0, 10),
-                'image' => $img,
-                'description' => $feed->getDescription()
+                'content' => $feed->getContent()
             ];
             if ($ctr == self::NUMBER_NEWS_FEEDS) break;
             $ctr++;

diff --git a/Controller/Adminhtml/Dashboard/Index.php b/Controller/Adminhtml/Dashboard/Index.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Magenerds\Dashboard\Block\AfterPrice
- *
  * Copyright (c) 2017 Magenerds
  * All rights reserved
  *
@@ -12,23 +10,16 @@
  * [email protected]
  */
 
-/**
- * @category   Magenerds
- * @package    Magenerds_Dashboard
- * @subpackage Controller
- * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
- * @link       http://www.magenerds.com/
- * @author     Florian Sydekum <[email protected]>
- */
 namespace Magenerds\Dashboard\Controller\Adminhtml\Dashboard;
 
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Backend\App\Action;
 
 /**
- * Class Index
- * @package Magenerds\Dashboard\Controller\Adminhtml\Dashboard
+ * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
+ * @link       http://www.magenerds.com/
+ * @author     Florian Sydekum <[email protected]>
  */
 class Index extends Action
 {

diff --git a/composer.json b/composer.json
@@ -6,7 +6,6 @@
     "magento/framework": "100.0.*|100.1.*"
   },
   "type": "magento2-module",
-  "version": "0.0.1",
   "license": [
     "proprietary"
   ],

diff --git a/etc/acl.xml b/etc/acl.xml
@@ -12,9 +12,6 @@
  */
 
 /**
- * @category   Magenerds
- * @package    Magenerds_Dashboard
- * @subpackage etc
  * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
  * @link       http://www.magenerds.com/
  * @author     Florian Sydekum <[email protected]>

diff --git a/etc/adminhtml/menu.xml b/etc/adminhtml/menu.xml
@@ -12,9 +12,6 @@
  */
 
 /**
- * @category   Magenerds
- * @package    Magenerds_Dashboard
- * @subpackage etc
  * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
  * @link       http://www.magenerds.com/
  * @author     Florian Sydekum <[email protected]>

diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml
@@ -12,9 +12,6 @@
  */
 
 /**
- * @category   Magenerds
- * @package    Magenerds_Dashboard
- * @subpackage etc
  * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
  * @link       http://www.magenerds.com/
  * @author     Florian Sydekum <[email protected]>

diff --git a/etc/module.xml b/etc/module.xml
@@ -12,9 +12,6 @@
  */
 
 /**
- * @category   Magenerds
- * @package    Magenerds_Dashboard
- * @subpackage etc
  * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
  * @link       http://www.magenerds.com/
  * @author     Florian Sydekum <[email protected]>

diff --git a/registration.php b/registration.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Magenerds\Dashboard\Block\AfterPrice
- *
  * Copyright (c) 2017 Magenerds
  * All rights reserved
  *
@@ -13,9 +11,6 @@
  */
 
 /**
- * @category   Magenerds
- * @package    Magenerds_Dashboard
- * @subpackage Module
  * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
  * @link       http://www.magenerds.com/
  * @author     Florian Sydekum <[email protected]>

diff --git a/view/adminhtml/layout/magenerds_dashboard_index.xml b/view/adminhtml/layout/magenerds_dashboard_index.xml
@@ -12,9 +12,6 @@
  */
 
 /**
- * @category   Magenerds
- * @package    Magenerds_Dashboard
- * @subpackage view
  * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
  * @link       http://www.magenerds.com/
  * @author     Florian Sydekum <[email protected]>

diff --git a/view/adminhtml/templates/dashboard.phtml b/view/adminhtml/templates/dashboard.phtml
@@ -11,9 +11,6 @@
  */
 
 /**
- * @category   Magenerds
- * @package    Magenerds_Dashboard
- * @subpackage view
  * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
  * @link       http://www.magenerds.com/
  * @author     Florian Sydekum <[email protected]>
@@ -59,10 +56,10 @@
                 to for contacting us. We only support cases issued via our bug report form.
             </div>
             <div class="buttons">
-                <button class="action-primary" title="Get support" id="support" onclick="setLocation('')">
+                <button class="action-primary" title="Get support" id="support" onclick="setLocation('http://www.magenerds.com/report-a-bug/')">
                     <span>Get support</span>
                 </button>
-                <button class="action-primary" title="Documentation" id="documentation" onclick="setLocation('')">
+                <button class="action-primary" title="Documentation" id="documentation" onclick="setLocation('http://doc.magenerds.com/')">
                     <span>Documentation</span>
                 </button>
                 <button class="action-primary" title="Website" id="website" onclick="setLocation('http://www.magenerds.com')">
@@ -83,9 +80,6 @@
                 <?php foreach ($block->getBlogFeeds() as $feed): ?>
                     <li>
                         <div class="title"><a href="<?php echo $feed['link'] ?>" target="_blank"><?php echo $feed['title'] ?></a> (<?php echo $feed['date']; ?>)</div>
-                        <?php if ($feed['image'] != ''): ?>
-                            <div><img src="<?php echo $feed['image'] ?>" /></div>
-                        <?php endif; ?>
                         <div class="description"><?php echo $feed['description'] ?>... <a href="<?php echo $feed['link'] ?>" target="_blank">(read more)</a></div>
                     </li>
                 <?php endforeach; ?>
@@ -96,11 +90,8 @@
             <ul>
                 <?php foreach ($block->getNewsFeeds() as $feed): ?>
                     <li>
-                        <div class="title"><a href="<?php echo $feed['link'] ?>" target="_blank"><?php echo $feed['title'] ?></a> (<?php echo $feed['date']; ?>)</div>
-                        <?php if ($feed['image'] != ''): ?>
-                            <div><img src="<?php echo $feed['image'] ?>" /></div>
-                        <?php endif; ?>
-                        <div class="description"><?php echo $feed['description'] ?>... <a href="<?php echo $feed['link'] ?>" target="_blank">(read more)</a></div>
+                        <div class="title"><?php echo $feed['title'] ?></div>
+                        <div class="content"><?php echo $feed['content'] ?></div>
                     </li>
                 <?php endforeach; ?>
             </ul>

diff --git a/view/adminhtml/web/css/style.css b/view/adminhtml/web/css/style.css
@@ -10,9 +10,6 @@
  */
 
 /**
- * @category   Magenerds
- * @package    Magenerds_Dashboard
- * @subpackage view
  * @copyright  Copyright (c) 2017 Magenerds (http://www.magenerds.com)
  * @link       http://www.magenerds.com/
  * @author     Florian Sydekum <[email protected]>