From 1ed02931b951dadfd4980dd185b86fbe5bc30071 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Sat, 28 Oct 2017 01:23:44 +0300
Subject: [PATCH] apps style

---
 public/css/addons.css                         |  5 --
 public/css/modules.css                        |  3 +
 resources/lang/en-GB/modules.php              |  4 +-
 resources/views/modules/item/show.blade.php   | 61 ++++++++-----------
 .../views/partials/modules/head.blade.php     |  8 +--
 .../views/partials/modules/item.blade.php     | 10 ++-
 6 files changed, 39 insertions(+), 52 deletions(-)
 delete mode 100644 public/css/addons.css
 create mode 100644 public/css/modules.css

diff --git a/public/css/addons.css b/public/css/addons.css
deleted file mode 100644
index 6d14a754f..000000000
--- a/public/css/addons.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.item-image {
-    width: 100%;
-    max-height: 150px;
-    margin-bottom: 15px;
-}
\ No newline at end of file
diff --git a/public/css/modules.css b/public/css/modules.css
new file mode 100644
index 000000000..a00599e0a
--- /dev/null
+++ b/public/css/modules.css
@@ -0,0 +1,3 @@
+.item-image {
+    max-width: 225px;
+}
\ No newline at end of file
diff --git a/resources/lang/en-GB/modules.php b/resources/lang/en-GB/modules.php
index 4a5e3e92c..771c64dbb 100644
--- a/resources/lang/en-GB/modules.php
+++ b/resources/lang/en-GB/modules.php
@@ -16,8 +16,8 @@ return [
     'uninstalled'           => 'Uninstalled',
     'token_link'            => '<a href="https://akaunting.com/tokens" target="_blank">Click here</a> to get your API token.',
 
-    'enabled'               => ':module module enabled',
-    'disabled'              => ':module module disabled',
+    'enabled'               => ':module app enabled',
+    'disabled'              => ':module app disabled',
 
     'installation' => [
         'header'            => 'Module Installation',
diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php
index da22dbdb0..a0a3bb613 100644
--- a/resources/views/modules/item/show.blade.php
+++ b/resources/views/modules/item/show.blade.php
@@ -11,37 +11,28 @@
                 <h3>{{ $module->name }}</h3>
             </div>
 
-            <div class="box box-success">
-                <div class="box-body">
-                    <div>
-                        <img src="{{ $module->cover->path_string }}" class="item-image" alt="{{ $module->name }}" width="800" height="140"/>
+            <div class="nav-tabs-custom">
+                <ul class="nav nav-tabs">
+                    <li class="active"><a href="#description" data-toggle="tab" aria-expanded="true">{{ trans('general.description') }}</a></li>
+                    <li class=""><a href="#faq" data-toggle="tab" aria-expanded="false">{{ trans('modules.faq') }}</a></li>
+                    <li class=""><a href="#changelog" data-toggle="tab" aria-expanded="false">{{ trans('modules.changelog') }}</a></li>
+                </ul>
+                <div class="tab-content">
+                    <div class="tab-pane active" id="description">
+                        {!! $module->description !!}
                     </div>
-                    <div class="nav-tabs-custom">
-                        <ul class="nav nav-tabs">
-                            <li class="active"><a href="#description" data-toggle="tab" aria-expanded="true">{{ trans('general.description') }}</a></li>
-                            <li class=""><a href="#faq" data-toggle="tab" aria-expanded="false">{{ trans('modules.faq') }}</a></li>
-                            <li class=""><a href="#changelog" data-toggle="tab" aria-expanded="false">{{ trans('modules.changelog') }}</a></li>
-                        </ul>
-                        <div class="tab-content">
-                            <div class="tab-pane active" id="description">
-                                {!! $module->description !!}
-                            </div>
-                            <!-- /.tab-pane -->
-                            <div class="tab-pane" id="faq">
-                                {!! $module->faq !!}
-                            </div>
-                            <!-- /.tab-pane -->
-                            <div class="tab-pane" id="changelog">
-                                {!! $module->changelog !!}
-                            </div>
-                            <!-- /.tab-pane -->
-                        </div>
-                        <!-- /.tab-content -->
+                    <!-- /.tab-pane -->
+                    <div class="tab-pane" id="faq">
+                        {!! $module->faq !!}
                     </div>
+                    <!-- /.tab-pane -->
+                    <div class="tab-pane" id="changelog">
+                        {!! $module->changelog !!}
+                    </div>
+                    <!-- /.tab-pane -->
                 </div>
-                <!-- /.box-body -->
+                <!-- /.tab-content -->
             </div>
-            <!-- /.box -->
         </div>
 
         <div class="col-md-4 no-padding-right">
@@ -55,11 +46,11 @@
                         <tbody>
                             <tr>
                                 <th>Price</th>
-                                <td>
+                                <td class="text-right">
                                     @if ($module->price == '0.0000')
                                         {{ trans('modules.free') }}
                                     @else
-                                        {{ $module->price }}
+                                        {{ $module->price . ' / month' }}
                                     @endif
                                 </td>
                             </tr>
@@ -100,27 +91,27 @@
                         <tbody>
                             <tr>
                                 <th>Vendor</th>
-                                <td><a href="{{ url('modules/vendor/' . $module->vendor->id) }}">{{ $module->vendor->first_name . ' ' . $module->vendor->last_name }}</a></td>
+                                <td class="text-right"><a href="{{ url('modules/vendor/' . $module->vendor->id) }}">{{ $module->vendor_name }}</a></td>
                             </tr>
                             <tr>
                                 <th>Version</th>
-                                <td>{{ $module->version }}</td>
+                                <td class="text-right">{{ $module->version }}</td>
                             </tr>
                             <tr>
                                 <th>Added</th>
-                                <td>{{ Date::parse($module->created_at)->format($date_format) }}</td>
+                                <td class="text-right">{{ Date::parse($module->created_at)->format($date_format) }}</td>
                             </tr>
                             <tr>
                                 <th>Updated</th>
-                                <td>{{ Date::parse($module->updated_at)->diffForHumans() }}</td>
+                                <td class="text-right">{{ Date::parse($module->updated_at)->diffForHumans() }}</td>
                             </tr>
                             <tr>
                                 <th>Compatibility</th>
-                                <td>{{ $module->compatibility }}</td>
+                                <td class="text-right">{{ $module->compatibility }}</td>
                             </tr>
                             <tr>
                                 <th>Category</th>
-                                <td><a href="{{ url('modules/category/' . $module->category->slug) }}">{{ $module->category->name }}</a></td>
+                                <td class="text-right"><a href="{{ url('modules/category/' . $module->category->slug) }}">{{ $module->category->name }}</a></td>
                             </tr>
                         </tbody>
                     </table>
diff --git a/resources/views/partials/modules/head.blade.php b/resources/views/partials/modules/head.blade.php
index cad501f1a..2076aa9d2 100644
--- a/resources/views/partials/modules/head.blade.php
+++ b/resources/views/partials/modules/head.blade.php
@@ -19,14 +19,14 @@
         <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-green-light.min.css') }}">
     @else
         <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-black.min.css') }}">
-        <link rel="stylesheet" href="{{ asset('public/css/skin-black.css?v=1.0') }}">
+        <link rel="stylesheet" href="{{ asset('public/css/skin-black.css?v=1.0.7') }}">
     @endif
     <!-- Select2 -->
     <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}">
     <!-- App style -->
-    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.0') }}">
-    <link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.0') }}">
-    <link rel="stylesheet" href="{{ asset('public/css/addons.css?v=1.0') }}">
+    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.0.7') }}">
+    <link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.0.7') }}">
+    <link rel="stylesheet" href="{{ asset('public/css/modules.css?v=1.0.7') }}">
     
     <link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}">
     
diff --git a/resources/views/partials/modules/item.blade.php b/resources/views/partials/modules/item.blade.php
index 10c090427..9b1121830 100644
--- a/resources/views/partials/modules/item.blade.php
+++ b/resources/views/partials/modules/item.blade.php
@@ -6,24 +6,22 @@
         </div>
         <!-- /.box-header -->
 
-        <div class="box-body">
+        <div class="box-body text-center">
             <a href="{{ url('modules/item/' . $module->slug) }}">
-                <img src="{{ $module->files[0]->path_string }}" alt="{{ $module->name }}" width="280" height="140">
-                <br>
-                {!! str_limit($module->description, 70) !!}
+                <img src="{{ $module->files[0]->path_string }}" alt="{{ $module->name }}" class="item-image">
             </a>
         </div>
         <!-- /.box-body -->
 
         <div class="box-footer">
             <div class="pull-left">
-                {{ $module->category->name }}
+                {{ $module->vendor_name }}
             </div>
             <div class="pull-right">
                 @if ($module->price == '0.0000')
                     {{ trans('modules.free') }}
                 @else
-                    {{ $module->price }}
+                    {{ $module->price . ' / month' }}
                 @endif
             </div>
         </div>