From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 7 Jun 2019 14:36:54 +0000 (+0200)
Subject: #2783
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ef751a4dbb2bd2b1a8db8bf787386381518640b5;p=cubist_cms-back.git

#2783
---

diff --git a/src/CubistBackpackServiceProvider.php b/src/CubistBackpackServiceProvider.php
index b3b1a43..173d520 100644
--- a/src/CubistBackpackServiceProvider.php
+++ b/src/CubistBackpackServiceProvider.php
@@ -25,7 +25,7 @@ class CubistBackpackServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->loadTranslationsFrom(__DIR__ . '/resources/lang', self::NAMESPACE);
+        $this->loadTranslationsFrom(realpath(__DIR__ . '/resources/lang'), self::NAMESPACE);
         foreach (glob(__DIR__ . '/routes/cubist/backpack/*.php') as $filename) {
             $this->loadRoutesFrom($filename);
         }
diff --git a/src/app/Magic/Fields/Integer.php b/src/app/Magic/Fields/Integer.php
new file mode 100644
index 0000000..c2a4a7e
--- /dev/null
+++ b/src/app/Magic/Fields/Integer.php
@@ -0,0 +1,10 @@
+<?php
+
+
+namespace Cubist\Backpack\app\Magic\Fields;
+
+
+class Integer extends Number
+{
+    protected $_step = 1;
+}
diff --git a/src/app/Magic/Fields/Number.php b/src/app/Magic/Fields/Number.php
index 542bad5..aa3135e 100644
--- a/src/app/Magic/Fields/Number.php
+++ b/src/app/Magic/Fields/Number.php
@@ -9,4 +9,23 @@ class Number extends Field
     protected $_adminType = 'number';
     protected $_databaseType = 'float';
     protected $_columnType = 'number';
+    protected $_step = 'any';
+    protected $_min = null;
+    protected $_max = null;
+
+    public function getDefaultAttributes()
+    {
+        $res = parent::getDefaultAttributes();
+        $attrs = ['min', 'max', 'step'];
+        $defaults = [];
+        foreach ($attrs as $attr) {
+            if (null === $this->{'_' . $attr}) {
+                continue;
+            }
+            $defaults[$attr] = $this->{'_' . $attr};
+        }
+
+        $res['attributes'] = array_merge($defaults, $res['attributes']);
+        return $res;
+    }
 }
diff --git a/src/app/Magic/Fields/Range.php b/src/app/Magic/Fields/Range.php
index b537d7f..f876143 100644
--- a/src/app/Magic/Fields/Range.php
+++ b/src/app/Magic/Fields/Range.php
@@ -6,8 +6,16 @@ namespace Cubist\Backpack\app\Magic\Fields;
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
 
-class Range extends Field
+class Range extends Number
 {
     protected $_adminType = 'rangeofvalues';
     protected $_viewNamespace = CubistBackpackServiceProvider::NAMESPACE . '::fields';
+
+    public function getDefaultAttributes()
+    {
+        $res = parent::getDefaultAttributes();
+        $res['first_label'] = trans('cubist_back::first_value');
+        $res['second_label'] = trans('cubist_back::second_value');
+        return $res;
+    }
 }
diff --git a/src/resources/lang/en/fields.php b/src/resources/lang/en/fields.php
new file mode 100644
index 0000000..28f15f2
--- /dev/null
+++ b/src/resources/lang/en/fields.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Templates Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used for Cubist backpack
+    |
+    */
+    'first_value' => 'First value',
+    'second_value' => 'Second value'
+];
diff --git a/src/resources/views/fields/rangeofvalues.blade.php b/src/resources/views/fields/rangeofvalues.blade.php
index 8157434..860bfd7 100644
--- a/src/resources/views/fields/rangeofvalues.blade.php
+++ b/src/resources/views/fields/rangeofvalues.blade.php
@@ -1,15 +1,21 @@
-<!-- field_type_name -->
+<!-- range of values -->
 <div @include('crud::inc.field_wrapper_attributes') >
     <label>{!! $field['label'] !!}</label>
-    <div @include('crud::inc.field_attributes')>
-        <input
-            type="text"
-            name="{{ $field['name'] }}[min]"
-        >
-        <input
-            type="text"
-            name="{{ $field['name'] }}[max]"
-        >
+    <div class="rangeofvalues__wrapper">
+        <div class="rangeofvalues__field">
+            <label>{!! $field['first_label'] !!}</label>
+            <input @include('crud::inc.field_attributes')
+                   type="text"
+                   name="{{ $field['name'] }}[min]"
+            >
+        </div>
+        <div class="rangeofvalues__field">
+            <label>{!! $field['second_label'] !!}</label>
+            <input @include('crud::inc.field_attributes')
+                   type="text"
+                   name="{{ $field['name'] }}[max]"
+            >
+        </div>
     </div>
 
     {{-- HINT --}}
@@ -23,7 +29,31 @@
     {{-- push things in the after_styles section --}}
 
     @push('crud_fields_styles')
-        <!-- no styles -->
+        <style type="text/css">
+            .rangeofvalues__wrapper {
+                width: 100%;
+                white-space: nowrap;
+            }
+
+            .rangeofvalues__field {
+                width: 50%;
+                display: inline-block;
+                padding: 0 15px;
+                box-sizing: border-box;
+            }
+
+            .rangeofvalues__field label{
+                font-weight: 400;
+            }
+
+            .rangeofvalues__field:first-child {
+                padding-left: 0;
+            }
+
+            .rangeofvalues__field:last-child {
+                padding-right: 0;
+            }
+        </style>
     @endpush
 
     {{-- FIELD EXTRA JS --}}