Merge pull request #70 from fractaslabs/master

Fix - an icons styles to SilverStripe font versions

css/lumberjack.css

@@ -22,6 +22,10 @@
   margin-right: 6px;
 }
 /* line 27, ../scss/lumberjack.scss */
+.cms .gridfield-icon.published i {
+  color: #3fa142;
+}
+/* line 30, ../scss/lumberjack.scss */
 .cms .modified {
   margin-left: 5px;
   color: #7E7470;

lang/de.yml

@@ -1,11 +1,11 @@
 de:
-  GridFieldSiteTreeAddNewButton:
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeAddNewButton::
     Add: 'Neuen {name} hinzufügen'
     AddMultipleOptions: 'Neuen hinzufügen'
-  GridFieldSiteTreeState:
-    Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Als Entwurf am {date} gespeichert'
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState:
+    Draft: 'Als Entwurf am {date} gespeichert'
     Modified: Geändert
-    Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Veröffentlicht am {date}'
+    Published: 'Veröffentlicht am {date}'
     StateTitle: Status
-  Lumberjack:
+  SilverStripe\Lumberjack\Model\Lumberjack:
     TabTitle: Unterseiten

lang/en.yml

@@ -3,9 +3,9 @@ en:
     Add: 'Add new {name}'
     AddMultipleOptions: 'Add new'
   SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState:
-    Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Saved as Draft on {date}'
+    Draft: 'Saved as Draft on {date}'
     Modified: Modified
-    Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Published on {date}'
+    Published: 'Published on {date}'
     StateTitle: State
   SilverStripe\Lumberjack\Model\Lumberjack:
     TabTitle: 'Child Pages'

lang/eo.yml

@@ -1,11 +1,11 @@
 eo:
-  GridFieldSiteTreeAddNewButton:
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeAddNewButton::
     Add: 'Enmeti novan {name}'
     AddMultipleOptions: 'Enmeti novan'
-  GridFieldSiteTreeState:
-    Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> konserviĝis kiel malneto je {date}'
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState:
+    Draft: 'konserviĝis kiel malneto je {date}'
     Modified: Ŝanĝita
-    Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> publikiĝis je {date}'
+    Published: 'publikiĝis je {date}'
     StateTitle: Stato
-  Lumberjack:
+  SilverStripe\Lumberjack\Model\Lumberjack:
     TabTitle: 'Idoj de paĝoj'

lang/fa_IR.yml

@@ -1,9 +1,9 @@
 fa_IR:
-  GridFieldSiteTreeAddNewButton:
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeAddNewButton::
     Add: 'افزودن {name} جدید'
     AddMultipleOptions: 'افزودن جدید'
-  GridFieldSiteTreeState:
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState:
     Modified: 'اصلاح شده'
     StateTitle: وضیعت
-  Lumberjack:
+  SilverStripe\Lumberjack\Model\Lumberjack:
     TabTitle: 'صفحات زیرین'

lang/fi.yml

@@ -1,11 +1,11 @@
 fi:
-  GridFieldSiteTreeAddNewButton:
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeAddNewButton::
     Add: 'Lisää uusi {name}'
     AddMultipleOptions: 'Lisää uusi'
-  GridFieldSiteTreeState:
-    Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Tallennettu luonnoksena {date}'
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState:
+    Draft: 'Tallennettu luonnoksena {date}'
     Modified: Muokattu
-    Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Julkaistu {date}'
+    Published: 'Julkaistu {date}'
     StateTitle: Tila
-  Lumberjack:
+  SilverStripe\Lumberjack\Model\Lumberjack:
     TabTitle: Alasivut

lang/hr.yml

@@ -1,11 +1,11 @@
 hr:
-  GridFieldSiteTreeAddNewButton:
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeAddNewButton::
     Add: 'Dodaj novi {name}'
     AddMultipleOptions: 'Dodaj novi'
-  GridFieldSiteTreeState:
-    Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Spremljeno kao Draft u {date}'
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState:
+    Draft: 'Spremljeno kao Draft u {date}'
     Modified: Promjenjeno
-    Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Objavljeno u {date}'
+    Published: 'Objavljeno u {date}'
     StateTitle: Stanje
-  Lumberjack:
+  SilverStripe\Lumberjack\Model\Lumberjack:
     TabTitle: Podstranice

lang/nl.yml

@@ -1,11 +1,11 @@
 nl:
-  GridFieldSiteTreeAddNewButton:
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeAddNewButton::
     Add: 'Voeg nieuwe {name} toe'
     AddMultipleOptions: 'Voeg nieuwe toe'
-  GridFieldSiteTreeState:
-    Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Opgeslagen als concept op {date}'
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState:
+    Draft: 'Opgeslagen als concept op {date}'
     Modified: Aangepast
-    Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Gepubliceerd op {date}'
+    Published: 'Gepubliceerd op {date}'
     StateTitle: Status
-  Lumberjack:
+  SilverStripe\Lumberjack\Model\Lumberjack:
     TabTitle: 'Onderliggende pagina''s'

lang/ru.yml

@@ -1,11 +1,11 @@
 ru:
-  GridFieldSiteTreeAddNewButton:
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeAddNewButton::
     Add: 'Добавить {name}'
     AddMultipleOptions: Добавить
-  GridFieldSiteTreeState:
-    Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Сохранено как черновик {date}'
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState:
+    Draft: 'Сохранено как черновик {date}'
     Modified: Изменено
-    Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Опубликовано {date}'
+    Published: 'Опубликовано {date}'
     StateTitle: Статус
-  Lumberjack:
+  SilverStripe\Lumberjack\Model\Lumberjack:
     TabTitle: Под-страницы

lang/sk.yml

@@ -1,11 +1,11 @@
 sk:
-  GridFieldSiteTreeAddNewButton:
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeAddNewButton::
     Add: 'Pridať {name}'
     AddMultipleOptions: Pridať
-  GridFieldSiteTreeState:
-    Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Uložený ako koncept: {date}'
+  SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState:
+    Draft: 'Uložený ako koncept: {date}'
     Modified: zmenené
-    Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Publikovaný: {date}'
+    Published: 'Publikovaný: {date}'
     StateTitle: Stav
-  Lumberjack:
+  SilverStripe\Lumberjack\Model\Lumberjack:
     TabTitle: Podstránky

scss/lumberjack.scss

@@ -24,6 +24,9 @@
 		float: left;
 		margin-right: 6px;
 	}
+	.gridfield-icon.published i {
+		color: #3fa142;
+	}
 	.modified {
 		margin-left: 5px;
 		color: #7E7470;
@@ -34,4 +37,4 @@
 		border-radius: 3px;
 		text-transform: uppercase;
 	}
-}
+}

src/Forms/GridFieldSiteTreeEditButton.php

@@ -28,9 +28,10 @@ public function getColumnContent($gridField, $record, $columnName)
         // No permission checks - handled through GridFieldDetailForm
         // which can make the form readonly if no edit permissions are available.
 
-        $data = ArrayData::create(
-            ['Link' => $record->CMSEditLink()]
-        );
+        $data = ArrayData::create([
+              'Link' => $record->CMSEditLink(),
+              'ExtraClass' => $this->getExtraClass()
+        ]);
 
         return $data->renderWith(GridFieldEditButton::class);
     }

src/Forms/GridFieldSiteTreeState.php

@@ -42,23 +42,23 @@ public function getColumnContent($gridField, $record, $columnName)
             if ($record->hasMethod('isPublished')) {
                 $modifiedLabel = '';
                 if ($record->isModifiedOnStage) {
-                    $modifiedLabel = "<span class='modified'>" . _t(__CLASS__ . '.Modified', 'Modified') . '</span>';
+                    $modifiedLabel = '<span class="modified">' . _t(__CLASS__ . '.Modified', 'Modified') . '</span>';
                 }
 
                 $published = $record->isPublished();
                 if (!$published) {
-                    return _t(
+                    return '<i class="font-icon-pencil btn--icon-md"></i>' .  _t(
                         __CLASS__ . '.Draft',
-                        '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Saved as Draft on {date}',
+                        'Saved as Draft on {date}',
                         'State for when a post is saved.',
                         array(
                             'date' => $record->dbObject('LastEdited')->Nice()
                         )
                     );
                 }
-                return _t(
+                return '<i class="font-icon-check-mark-circle btn--icon-md"></i>' . _t(
                     __CLASS__ . '.Published',
-                    '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Published on {date}',
+                    'Published on {date}',
                     'State for when a post is published.',
                     array(
                         'date' => $record->dbObject('LastEdited')->Nice()