From a743d786580dfff82ef7eb9a04ad8d8cbcd316ed Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 25 Mar 2015 19:35:00 +1100
Subject: [PATCH] List Column of type switch now has text-center CSS List
 Column now have getName and getId accessors

---
 modules/backend/assets/css/controls.css       |  1 +
 .../backend/assets/less/controls/lists.less   |  5 ++++
 modules/backend/classes/FormField.php         |  2 ++
 modules/backend/classes/ListColumn.php        | 29 +++++++++++++++++++
 .../widgets/lists/partials/_list_body_row.htm |  2 +-
 .../widgets/lists/partials/_list_head_row.htm |  4 +--
 6 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/modules/backend/assets/css/controls.css b/modules/backend/assets/css/controls.css
index fb80373c0..ea48e48df 100644
--- a/modules/backend/assets/css/controls.css
+++ b/modules/backend/assets/css/controls.css
@@ -181,6 +181,7 @@ table.table.data tbody td.column-slim{padding-left:0;padding-right:0}
 table.table.data tbody td.column-compact{padding:0}
 table.table.data tfoot a{color:#666666;text-decoration:none}
 table.table.data tfoot td,table.table.data tfoot th{border-color:#e2e2e2;padding:10px 15px}
+table.table.data th.list-cell-type-switch,table.table.data td.list-cell-type-switch{text-align:center}
 table.table.data .list-checkbox{padding-left:16px;padding-right:8px;width:52px;vertical-align:top;border-right:1px solid #eeeeee}
 table.table.data .list-checkbox .checkbox{margin:0}
 table.table.data .list-checkbox .custom-checkbox{position:relative;top:5px;left:-2px}
diff --git a/modules/backend/assets/less/controls/lists.less b/modules/backend/assets/less/controls/lists.less
index cdab8fe12..be6b83f91 100644
--- a/modules/backend/assets/less/controls/lists.less
+++ b/modules/backend/assets/less/controls/lists.less
@@ -256,6 +256,11 @@ table.table.data {
         }
     }
 
+    th.list-cell-type-switch,
+    td.list-cell-type-switch {
+        text-align: center;
+    }
+
     .list-checkbox {
         padding-left: 16px;
         padding-right: 8px;
diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php
index 2a9a2ec06..1c198fcb6 100644
--- a/modules/backend/classes/FormField.php
+++ b/modules/backend/classes/FormField.php
@@ -487,6 +487,8 @@ class FormField
 
     /**
      * Returns a value suitable for the field id property.
+     * @param  string $suffix Specify a suffix string
+     * @return string
      */
     public function getId($suffix = null)
     {
diff --git a/modules/backend/classes/ListColumn.php b/modules/backend/classes/ListColumn.php
index c85cb5862..e352ef35b 100644
--- a/modules/backend/classes/ListColumn.php
+++ b/modules/backend/classes/ListColumn.php
@@ -1,5 +1,7 @@
 <?php namespace Backend\Classes;
 
+use October\Rain\Html\Helper as HtmlHelper;
+
 /**
  * List Columns definition
  * A translation of the list column configuration
@@ -147,4 +149,31 @@ class ListColumn
 
         return $config;
     }
+
+    /**
+     * Returns a HTML valid name for the column name.
+     * @return string
+     */
+    public function getName()
+    {
+        return HtmlHelper::nameToId($this->columnName);
+    }
+
+    /**
+     * Returns a value suitable for the column id property.
+     * @param  string $suffix Specify a suffix string
+     * @return string
+     */
+    public function getId($suffix = null)
+    {
+        $id = 'column';
+
+        $id .= '-'.$this->columnName;
+
+        if ($suffix) {
+            $id .= '-'.$suffix;
+        }
+
+        return HtmlHelper::nameToId($id);
+    }
 }
diff --git a/modules/backend/widgets/lists/partials/_list_body_row.htm b/modules/backend/widgets/lists/partials/_list_body_row.htm
index 4c0525b28..e7cabcde2 100644
--- a/modules/backend/widgets/lists/partials/_list_body_row.htm
+++ b/modules/backend/widgets/lists/partials/_list_body_row.htm
@@ -19,7 +19,7 @@
 
     <?php $index = 0; foreach ($columns as $key => $column): ?>
         <?php $index++; ?>
-        <td data-title="<?= e(trans($column->label)) ?>" class="list-cell-index-<?= $index ?> list-cell-name-<?= $column->columnName ?> list-cell-type-<?= $column->type ?> <?= $column->cssClass ?>">
+        <td data-title="<?= e(trans($column->label)) ?>" class="list-cell-index-<?= $index ?> list-cell-name-<?= $column->getName() ?> list-cell-type-<?= $column->type ?> <?= $column->cssClass ?>">
             <?php if ($index == 1 && ($url = $this->getRecordUrl($record))): ?>
                 <a <?= $this->getRecordOnClick($record) ?> href="<?= $url ?>">
                     <?= $this->getColumnValue($record, $column) ?>
diff --git a/modules/backend/widgets/lists/partials/_list_head_row.htm b/modules/backend/widgets/lists/partials/_list_head_row.htm
index d1385f062..45f93d1c5 100644
--- a/modules/backend/widgets/lists/partials/_list_head_row.htm
+++ b/modules/backend/widgets/lists/partials/_list_head_row.htm
@@ -18,7 +18,7 @@
         <?php if ($showSorting && $column->sortable): ?>
             <th
                 <?php if ($column->width): ?>style="width: <?= $column->width ?>"<?php endif ?>
-                class="<?= $this->sortColumn==$column->columnName?'sort-'.$this->sortDirection.' active':'sort-desc' ?> list-cell-name-<?= $column->columnName ?>"
+                class="<?= $this->sortColumn==$column->columnName?'sort-'.$this->sortDirection.' active':'sort-desc' ?> list-cell-name-<?= $column->getName() ?> list-cell-type-<?= $column->type ?>"
                 >
                 <a
                     href="javascript:;"
@@ -31,7 +31,7 @@
         <?php else: ?>
             <th
                 <?php if ($column->width): ?>style="width: <?= $column->width ?>"<?php endif ?>
-                class="list-cell-name-<?= $column->columnName ?>"
+                class="list-cell-name-<?= $column->getName() ?> list-cell-type-<?= $column->type ?>"
                 >
                 <span><?= $this->getHeaderValue($column) ?></span>
             </th>