Added font-awesome support

magium · May 8, 2017 · 5aef44a · 5aef44a
1 parent 3666656
commit 5aef44a
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 7 deletions.
diff --git a/assets/configuration.xsd b/assets/configuration.xsd
@@ -82,6 +82,7 @@
                         <xs:attribute name="identifier" type="xs:string" use="required"/>
                         <xs:attribute type="xs:string" name="label" use="optional"/>
                         <xs:attribute type="xs:string" name="glyphicon" use="optional"/>
+                        <xs:attribute type="xs:string" name="font-awesome" use="optional"/>
                         <xs:attribute name="hidden" use="optional">
                             <xs:simpleType>
                                 <xs:restriction base="xs:string">

diff --git a/examples/example-configuration.xml b/examples/example-configuration.xml
@@ -14,7 +14,7 @@
             <element identifier="theme" label="Theme"/>
         </group>
     </section>
-    <section identifier="security" label="Security">
+    <section identifier="security" label="Security" font-awesome="lock">
         <group identifier="authentication" label="Authentication">
             <element identifier="require" label="Require Authentication" type="select" source="Magium\Configuration\Source\YesNo"/>
         </group>

diff --git a/lib/View/Controllers/Layout.php b/lib/View/Controllers/Layout.php
@@ -3,7 +3,6 @@
 namespace Magium\Configuration\View\Controllers;
 
 use Magium\Configuration\Config\MergedStructure;
-use Magium\Configuration\Config\Repository\ConfigInterface;
 use Magium\Configuration\File\Context\AbstractContextConfigurationFile;
 use Magium\Configuration\MagiumConfigurationFactoryInterface;
 use Magium\Configuration\View\Controllers\Helpers\ContextRepository;
@@ -86,6 +85,8 @@ protected function provideSections()
             ];
             if (isset($section['glyphicon'])) {
                 $returnSections[$sectionId]['glyphicon'] = (string)$section['glyphicon'];
+            } else if (isset($section['font-awesome'])) {
+                $returnSections[$sectionId]['font-awesome'] = (string)$section['font-awesome'];
             }
         }
         return $returnSections;

diff --git a/lib/View/views/layout.phtml b/lib/View/views/layout.phtml
@@ -78,6 +78,8 @@
                                         id="section-<?php echo htmlspecialchars($sectionId); ?>">
                                     <?php if (isset($sectionData['glyphicon'])): ?>
                                         <i class="glyphicon glyphicon-<?php echo htmlspecialchars($sectionData['glyphicon']); ?>"></i>
+                                    <?php elseif (isset($sectionData['font-awesome'])): ?>
+                                        <i class="fa fa-<?php echo htmlspecialchars($sectionData['font-awesome']); ?>"></i>
                                     <?php else: ?>
                                         <i class="glyphicon glyphicon-plus"></i>
                                     <?php endif; ?>

diff --git a/tests/View/SectionTest.php b/tests/View/SectionTest.php
@@ -7,9 +7,8 @@
 use Magium\Configuration\Config\MergedStructure;
 use Magium\Configuration\File\Context\AbstractContextConfigurationFile;
 use Magium\Configuration\MagiumConfigurationFactoryInterface;
-use Magium\Configuration\View\ViewConfiguration;
 use Magium\Configuration\View\FrontController;
-use SebastianBergmann\PHPLOC\Log\XML;
+use Magium\Configuration\View\ViewConfiguration;
 
 class SectionTest extends AbstractViewTestCase
 {
@@ -113,6 +112,22 @@ public function testGylphiconRendered()
         $simpleXml = $this->getContent($response);
         self::assertXpathExists($simpleXml, '//nav/descendant::ul[@id="magium-sections"]/descendant::li/i[contains(concat(" ",normalize-space(@class)," "), " glyphicon-test ")]');
     }
+    public function testFontAwesomeRendered()
+    {
+
+        $viewConfiguration = $this->getViewConfiguration();
+        $viewManager = $this->getFrontController($viewConfiguration, <<<XML
+<magiumConfiguration xmlns="http://www.magiumlib.com/Configuration">
+<section identifier="section1" label="Section Eins" font-awesome="test"/>
+</magiumConfiguration>
+XML
+        );
+
+        /* @var $viewManager FrontController */
+        $response = $viewManager->render();
+        $simpleXml = $this->getContent($response);
+        self::assertXpathExists($simpleXml, '//nav/descendant::ul[@id="magium-sections"]/descendant::li/i[contains(concat(" ",normalize-space(@class)," "), " fa-test ")]');
+    }
 
     public function testJqueryRendered()
     {

diff --git a/tests/View/ViewTest.php b/tests/View/ViewTest.php
@@ -4,8 +4,8 @@
 
 use Interop\Container\ContainerInterface;
 use Magium\Configuration\Config\BuilderInterface;
-use Magium\Configuration\Config\Repository\ConfigurationRepository;
 use Magium\Configuration\Config\MergedStructure;
+use Magium\Configuration\Config\Repository\ConfigurationRepository;
 use Magium\Configuration\Config\Storage\StorageInterface;
 use Magium\Configuration\MagiumConfigurationFactoryInterface;
 use Magium\Configuration\View\FrontController;
@@ -62,7 +62,7 @@ public function testGroupDisplayed()
         $dom->loadHTML(sprintf('<html><body>%s</body></html>', $content));
         $simpleXml = simplexml_import_dom($dom);
         self::assertXpathNotExists($simpleXml, '//title'); // Make sure the layout isn't called
-        self::assertXpathExists($simpleXml, '//h2/a[.="Test"]');
+        self::assertXpathExists($simpleXml, '//h2/span[.="Test"]');
         self::assertXpathExists($simpleXml, '//label[.="Element"]');
         self::assertXpathExists($simpleXml, '//input[@type="text" and @name="section1_test_element"]'); // we do this separately to test if the element exists apart from whether it has a value.
         self::assertXpathExists($simpleXml, '//input[@type="text" and @name="section1_test_element" and @value="Element Value"]');

diff --git a/tests/View/standalone/settings/active-directory.xml b/tests/View/standalone/settings/active-directory.xml
@@ -1,5 +1,5 @@
 <magiumConfiguration xmlns="http://www.magiumlib.com/Configuration">
-    <section identifier="magium" label="Magium">
+    <section identifier="magium" label="Magium" font-awesome="sign-in">
         <group identifier="ad" label="Active Directory">
             <element identifier="enabled" label="Enabled" type="select" source="Magium\Configuration\Source\Switches\YesNo">
                 <description>Is the Magium Active Directory integration enabled?</description>