change the Form alias name to CollectiveForm to solve any other appli…

…cation conflicts #91
thekordy · Dec 8, 2015 · 4e176aa · 4e176aa
1 parent 8ed722b
commit 4e176aa
Show file tree

Hide file tree

Showing 23 changed files with 112 additions and 115 deletions.
diff --git a/src/TicketitServiceProvider.php b/src/TicketitServiceProvider.php
@@ -1,7 +1,7 @@
 <?php
 namespace Kordy\Ticketit;
 
-use Collective\Html\FormFacade as Form;
+use Collective\Html\FormFacade as CollectiveForm;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Route;
@@ -36,7 +36,7 @@ public function boot() {
             });
 
             // Adding HTML5 color picker to form elements
-            Form::macro('custom', function ($type, $name, $value = "#000000", $options = []) {
+            CollectiveForm::macro('custom', function ($type, $name, $value = "#000000", $options = []) {
                 $field = $this->input($type, $name, $value, $options);
                 return $field;
             });
@@ -136,9 +136,6 @@ public function register() {
          * Create aliases for the dependency.
          */
         $loader = \Illuminate\Foundation\AliasLoader::getInstance();
-        $loader->alias('Form', 'Collective\Html\FormFacade');
-        $loader->alias('Html', 'Collective\Html\HtmlFacade');
-        $loader->alias('Datatables', 'yajra\Datatables\Datatables');
-        $loader->alias('Date', 'Jenssegers\Date\Date');
+        $loader->alias('CollectiveForm', 'Collective\Html\FormFacade');
 	}
 }
diff --git a/src/Views/admin/administrator/create.blade.php b/src/Views/admin/administrator/create.blade.php
@@ -10,7 +10,7 @@
         @if ($users->isEmpty())
             <h3 class="text-center">{{ trans('ticketit::admin.administrator-create-no-users') }}</h3>
         @else
-            {!! Form::open(['route'=> $setting->grab('admin_route').'.administrator.store', 'method' => 'POST', 'class' => 'form-horizontal']) !!}
+            {!! CollectiveForm::open(['route'=> $setting->grab('admin_route').'.administrator.store', 'method' => 'POST', 'class' => 'form-horizontal']) !!}
             <div class="panel-body">
                 {{ trans('ticketit::admin.administrator-create-select-user') }}
             </div>
@@ -19,7 +19,7 @@
                     <tr>
                         <td class="text-center">
                             {!! link_to_route($setting->grab('admin_route').'.administrator.index', trans('ticketit::admin.btn-back'), null, ['class' => 'btn btn-default']) !!}
-                            {!! Form::submit(trans('ticketit::admin.btn-submit'), ['class' => 'btn btn-primary']) !!}
+                            {!! CollectiveForm::submit(trans('ticketit::admin.btn-submit'), ['class' => 'btn btn-primary']) !!}
                         </td>
                     </tr>
                 <tbody>
@@ -36,7 +36,7 @@
                 @endforeach
                 </tbody>
             </table>
-            {!! Form::close() !!}
+            {!! CollectiveForm::close() !!}
         @endif
     </div>
     {!! $users->render() !!}

diff --git a/src/Views/admin/administrator/index.blade.php b/src/Views/admin/administrator/index.blade.php
@@ -41,16 +41,16 @@
                             {{ $administrator->name }}
                         </td>
                         <td>
-                            {!! Form::open([
+                            {!! CollectiveForm::open([
                             'method' => 'DELETE',
                             'route' => [
                                         $setting->grab('admin_route').'.administrator.destroy',
                                         $administrator->id
                                         ],
                             'id' => "delete-$administrator->id"
                             ]) !!}
-                            {!! Form::submit(trans('ticketit::admin.btn-remove'), ['class' => 'btn btn-danger']) !!}
-                            {!! Form::close() !!}
+                            {!! CollectiveForm::submit(trans('ticketit::admin.btn-remove'), ['class' => 'btn btn-danger']) !!}
+                            {!! CollectiveForm::close() !!}
                         </td>
                     </tr>
                 @endforeach

diff --git a/src/Views/admin/agent/create.blade.php b/src/Views/admin/agent/create.blade.php
@@ -10,7 +10,7 @@
         @if ($users->isEmpty())
             <h3 class="text-center">{{ trans('ticketit::admin.agent-create-no-users') }}</h3>
         @else
-            {!! Form::open(['route'=> $setting->grab('admin_route').'.agent.store', 'method' => 'POST', 'class' => 'form-horizontal']) !!}
+            {!! CollectiveForm::open(['route'=> $setting->grab('admin_route').'.agent.store', 'method' => 'POST', 'class' => 'form-horizontal']) !!}
             <div class="panel-body">
                 {{ trans('ticketit::admin.agent-create-select-user') }}
             </div>
@@ -19,7 +19,7 @@
                     <tr>
                         <td class="text-center">
                             {!! link_to_route($setting->grab('admin_route').'.agent.index', trans('ticketit::admin.btn-back'), null, ['class' => 'btn btn-default']) !!}
-                            {!! Form::submit(trans('ticketit::admin.btn-submit'), ['class' => 'btn btn-primary']) !!}
+                            {!! CollectiveForm::submit(trans('ticketit::admin.btn-submit'), ['class' => 'btn btn-primary']) !!}
                         </td>
                     </tr>
                 <tbody>
@@ -36,7 +36,7 @@
                 @endforeach
                 </tbody>
             </table>
-            {!! Form::close() !!}
+            {!! CollectiveForm::close() !!}
         @endif
     </div>
     {!! $users->render() !!}

diff --git a/src/Views/admin/agent/index.blade.php b/src/Views/admin/agent/index.blade.php
@@ -50,7 +50,7 @@
                             @endforeach
                         </td>
                         <td>
-                            {!! Form::open([
+                            {!! CollectiveForm::open([
                                             'method' => 'PATCH',
                                             'route' => [
                                                         $setting->grab('admin_route').'.agent.update',
@@ -64,20 +64,20 @@
                                        {!! ($agent_cat->agents()->where("id", $agent->id)->count() > 0) ? "checked" : ""  !!}
                                        > {{ $agent_cat->name }}
                             @endforeach
-                            {!! Form::submit(trans('ticketit::admin.btn-join'), ['class' => 'btn btn-info btn-sm']) !!}
-                            {!! Form::close() !!}
+                            {!! CollectiveForm::submit(trans('ticketit::admin.btn-join'), ['class' => 'btn btn-info btn-sm']) !!}
+                            {!! CollectiveForm::close() !!}
                         </td>
                         <td>
-                            {!! Form::open([
+                            {!! CollectiveForm::open([
                             'method' => 'DELETE',
                             'route' => [
                                         $setting->grab('admin_route').'.agent.destroy',
                                         $agent->id
                                         ],
                             'id' => "delete-$agent->id"
                             ]) !!}
-                            {!! Form::submit(trans('ticketit::admin.btn-remove'), ['class' => 'btn btn-danger']) !!}
-                            {!! Form::close() !!}
+                            {!! CollectiveForm::submit(trans('ticketit::admin.btn-remove'), ['class' => 'btn btn-danger']) !!}
+                            {!! CollectiveForm::close() !!}
                         </td>
                     </tr>
                 @endforeach

diff --git a/src/Views/admin/category/create.blade.php b/src/Views/admin/category/create.blade.php
@@ -3,9 +3,9 @@
 
 @section('content')
     <div class="well bs-component">
-        {!! Form::open(['route'=> $setting->grab('admin_route').'.category.store', 'method' => 'POST', 'class' => 'form-horizontal']) !!}
+        {!! CollectiveForm::open(['route'=> $setting->grab('admin_route').'.category.store', 'method' => 'POST', 'class' => 'form-horizontal']) !!}
             <legend>{{ trans('ticketit::admin.category-create-title') }}</legend>
             @include('ticketit::admin.category.form')
-        {!! Form::close() !!}
+        {!! CollectiveForm::close() !!}
     </div>
 @stop
diff --git a/src/Views/admin/category/edit.blade.php b/src/Views/admin/category/edit.blade.php
@@ -4,13 +4,13 @@
 @section('content')
     @include('ticketit::shared.header')
     <div class="well bs-component">
-        {!! Form::model($category, [
+        {!! CollectiveForm::model($category, [
                                     'route' => [$setting->grab('admin_route').'.category.update', $category->id],
                                     'method' => 'PATCH',
                                     'class' => 'form-horizontal'
                                     ]) !!}
         <legend>{{ trans('ticketit::admin.category-edit-title', ['name' => ucwords($category->name)]) }}</legend>
         @include('ticketit::admin.category.form', ['update', true])
-        {!! Form::close() !!}
+        {!! CollectiveForm::close() !!}
     </div>
 @stop
diff --git a/src/Views/admin/category/form.blade.php b/src/Views/admin/category/form.blade.php
@@ -1,22 +1,22 @@
 <div class="form-group">
-    {!! Form::label('name', trans('ticketit::admin.category-create-name') . trans('ticketit::admin.colon'), ['class' => 'col-lg-2 control-label']) !!}
+    {!! CollectiveForm::label('name', trans('ticketit::admin.category-create-name') . trans('ticketit::admin.colon'), ['class' => 'col-lg-2 control-label']) !!}
     <div class="col-lg-10">
-        {!! Form::text('name', isset($category->name) ? $category->name : null, ['class' => 'form-control']) !!}
+        {!! CollectiveForm::text('name', isset($category->name) ? $category->name : null, ['class' => 'form-control']) !!}
     </div>
 </div>
 <div class="form-group">
-    {!! Form::label('color', trans('ticketit::admin.category-create-color') . trans('ticketit::admin.colon'), ['class' => 'col-lg-2 control-label']) !!}
+    {!! CollectiveForm::label('color', trans('ticketit::admin.category-create-color') . trans('ticketit::admin.colon'), ['class' => 'col-lg-2 control-label']) !!}
     <div class="col-lg-10">
-        {!! Form::custom('color', 'color', isset($category->color) ? $category->color : "#000000", ['class' => 'form-control']) !!}
+        {!! CollectiveForm::custom('color', 'color', isset($category->color) ? $category->color : "#000000", ['class' => 'form-control']) !!}
     </div>
 </div>
 <div class="form-group">
     <div class="col-lg-10 col-lg-offset-2">
         {!! link_to_route($setting->grab('admin_route').'.category.index', trans('ticketit::admin.btn-back'), null, ['class' => 'btn btn-default']) !!}
         @if(isset($category))
-            {!! Form::submit(trans('ticketit::admin.btn-update'), ['class' => 'btn btn-primary']) !!}
+            {!! CollectiveForm::submit(trans('ticketit::admin.btn-update'), ['class' => 'btn btn-primary']) !!}
         @else
-            {!! Form::submit(trans('ticketit::admin.btn-submit'), ['class' => 'btn btn-primary']) !!}
+            {!! CollectiveForm::submit(trans('ticketit::admin.btn-submit'), ['class' => 'btn btn-primary']) !!}
         @endif
     </div>
 </div>
diff --git a/src/Views/admin/category/index.blade.php b/src/Views/admin/category/index.blade.php
@@ -54,7 +54,7 @@
                                                     "node" => $category->name
                                                     ])
                                 !!}
-                            {!! Form::open([
+                            {!! CollectiveForm::open([
                                             'method' => 'DELETE',
                                             'route' => [
                                                         $setting->grab('admin_route').'.category.destroy',
@@ -63,7 +63,7 @@
                                             'id' => "delete-$category->id"
                                             ])
                             !!}
-                            {!! Form::close() !!}
+                            {!! CollectiveForm::close() !!}
                         </td>
                     </tr>
                 @endforeach

diff --git a/src/Views/admin/configuration/create.blade.php b/src/Views/admin/configuration/create.blade.php
@@ -16,49 +16,49 @@
       </div>       
       <div class="panel-body">
         <div class="form-horizontal">
-{!! Form::open(['route' => $setting->grab('admin_route').'.configuration.store']) !!}
+{!! CollectiveForm::open(['route' => $setting->grab('admin_route').'.configuration.store']) !!}
 
             <!-- Slug Field -->
             <div class="form-group">
-                {!! Form::label('slug', trans('ticketit::admin.config-edit-slug') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
+                {!! CollectiveForm::label('slug', trans('ticketit::admin.config-edit-slug') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
                 <div class="col-sm-9">
-                    {!! Form::text('slug', null, ['class' => 'form-control']) !!}
+                    {!! CollectiveForm::text('slug', null, ['class' => 'form-control']) !!}
                 </div>
             </div>
 
             <!-- Default Field -->
             <div class="form-group">
-                {!! Form::label('default', trans('ticketit::admin.config-edit-default') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
+                {!! CollectiveForm::label('default', trans('ticketit::admin.config-edit-default') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
                 <div class="col-sm-9">
-                    {!! Form::text('default', null, ['class' => 'form-control']) !!}
+                    {!! CollectiveForm::text('default', null, ['class' => 'form-control']) !!}
                 </div>
             </div>
 
             <!-- Value Field -->
             <div class="form-group">
-                {!! Form::label('value', trans('ticketit::admin.config-edit-value') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
+                {!! CollectiveForm::label('value', trans('ticketit::admin.config-edit-value') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
                 <div class="col-sm-9">
-                    {!! Form::text('value', null, ['class' => 'form-control']) !!}
+                    {!! CollectiveForm::text('value', null, ['class' => 'form-control']) !!}
                 </div>
             </div>
 
             <!-- Lang Field -->
             <div class="form-group">
-                {!! Form::label('lang', trans('ticketit::admin.config-edit-language') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
+                {!! CollectiveForm::label('lang', trans('ticketit::admin.config-edit-language') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
                 <div class="col-sm-9">
-                    {!! Form::text('lang', null, ['class' => 'form-control']) !!}
+                    {!! CollectiveForm::text('lang', null, ['class' => 'form-control']) !!}
 
                 </div>
             </div>
 
             <!-- Submit Field -->
             <div class="form-group">
                 <div class="col-sm-10 col-sm-offset-2">
-                  {!! Form::submit(trans('ticketit::admin.btn-submit'), ['class' => 'btn btn-primary']) !!}
+                  {!! CollectiveForm::submit(trans('ticketit::admin.btn-submit'), ['class' => 'btn btn-primary']) !!}
                 </div>
             </div>
 
-          {!! Form::close() !!}
+          {!! CollectiveForm::close() !!}
         </div>
       </div>
       <div class="panel-footer">

diff --git a/src/Views/admin/configuration/edit.blade.php b/src/Views/admin/configuration/edit.blade.php
@@ -24,7 +24,7 @@
       <div class="panel-body">
         <div class="form-horizontal">
           @include('ticketit::shared.errors')
-{!! Form::model($configuration, ['route' => [$setting->grab('admin_route').'.configuration.update', $configuration->id], 'method' => 'patch']) !!}
+{!! CollectiveForm::model($configuration, ['route' => [$setting->grab('admin_route').'.configuration.update', $configuration->id], 'method' => 'patch']) !!}
              <div class="well">
                  <b>{{ trans('ticketit::admin.config-edit-tools') }}</b><br>
                  <a href="https://www.functions-online.com/unserialize.html" target="_blank">
@@ -37,52 +37,52 @@
              </div>
               <!-- ID Field -->
               <div class="form-group">
-                  {!! Form::label('id', trans('ticketit::admin.config-edit-id') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
+                  {!! CollectiveForm::label('id', trans('ticketit::admin.config-edit-id') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
                   <div class="col-sm-9">
-                      {!! Form::text('id', null, ['class' => 'form-control', 'disabled']) !!}
+                      {!! CollectiveForm::text('id', null, ['class' => 'form-control', 'disabled']) !!}
                   </div>
               </div>                
 
               <!-- Slug Field -->
               <div class="form-group">
-                  {!! Form::label('slug', trans('ticketit::admin.config-edit-slug') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
+                  {!! CollectiveForm::label('slug', trans('ticketit::admin.config-edit-slug') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
                   <div class="col-sm-9">
-                      {!! Form::text('slug', null, ['class' => 'form-control', 'disabled']) !!}
+                      {!! CollectiveForm::text('slug', null, ['class' => 'form-control', 'disabled']) !!}
                   </div>
               </div>
 
               <!-- Default Field -->
               <div class="form-group">
-                  {!! Form::label('default', trans('ticketit::admin.config-edit-default') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
+                  {!! CollectiveForm::label('default', trans('ticketit::admin.config-edit-default') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
                   <div class="col-sm-9">
-                      {!! Form::text('default', null, ['class' => 'form-control', 'disabled']) !!}
+                      {!! CollectiveForm::text('default', null, ['class' => 'form-control', 'disabled']) !!}
                   </div>
               </div>
 
               <!-- Value Field -->
               <div class="form-group">
-                  {!! Form::label('value', trans('ticketit::admin.config-edit-value') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
+                  {!! CollectiveForm::label('value', trans('ticketit::admin.config-edit-value') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
                   <div class="col-sm-9">
-                      {!! Form::text('value', null, ['class' => 'form-control']) !!}
+                      {!! CollectiveForm::text('value', null, ['class' => 'form-control']) !!}
                   </div>
               </div>
 
               <!-- Lang Field -->
               <div class="form-group">
-                  {!! Form::label('lang', trans('ticketit::admin.config-edit-language') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
+                  {!! CollectiveForm::label('lang', trans('ticketit::admin.config-edit-language') . trans('ticketit::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
                   <div class="col-sm-9">
-                      {!! Form::text('lang', null, ['class' => 'form-control']) !!}
+                      {!! CollectiveForm::text('lang', null, ['class' => 'form-control']) !!}
                   </div>
               </div>
 
               <!-- Submit Field -->
               <div class="form-group">
                   <div class="col-sm-10 col-sm-offset-2">
-                    {!! Form::submit(trans('ticketit::admin.btn-submit'), ['class' => 'btn btn-primary']) !!}
+                    {!! CollectiveForm::submit(trans('ticketit::admin.btn-submit'), ['class' => 'btn btn-primary']) !!}
                   </div>
               </div>
 
-          {!! Form::close() !!}
+          {!! CollectiveForm::close() !!}
         </div>
       </div>
       <div class="panel-footer">

diff --git a/src/Views/admin/priority/create.blade.php b/src/Views/admin/priority/create.blade.php
@@ -4,9 +4,9 @@
 @section('content')
     @include('ticketit::shared.header')
     <div class="well bs-component">
-        {!! Form::open(['route'=> $setting->grab('admin_route').'.priority.store', 'method' => 'POST', 'class' => 'form-horizontal']) !!}
+        {!! CollectiveForm::open(['route'=> $setting->grab('admin_route').'.priority.store', 'method' => 'POST', 'class' => 'form-horizontal']) !!}
             <legend>{{ trans('ticketit::admin.priority-create-title') }}</legend>
             @include('ticketit::admin.priority.form')
-        {!! Form::close() !!}
+        {!! CollectiveForm::close() !!}
     </div>
 @stop