Merge pull request #304 from andreapollastri/3.x

Template Fix
andreapollastri · Dec 10, 2021 · 4f890ac · 4f890ac
2 parents 355d3c7 + 28b4dd7
commit 4f890ac
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,27 +10,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 (no unreleased versions)
 
-## [3.1.5] - 2021-12-10
+## [3.1.6] - 2021-12-10
+### Fixed
+- Mobile App link in menù
+- Minor fix in views
 
+## [3.1.5] - 2021-12-10
 ## Added
 - Cipi App link in menù
-### Fixes
+### Fixed
 - PHP 7.3 legacy support fix
 
 ## [3.1.4] - 2021-12-10
-### Fixes
+### Fixed
 - Login BG fix
 
 ## [3.1.3] - 2021-12-10
-### Fixes
+### Fixed
 - Views fix
 
 ## [3.1.2] - 2021-12-10
-### Fixes
+### Fixed
 - Domains conflict fix
 
 ## [3.1.1] - 2021-12-09
-### Fixes
+### Fixed
 - Let's Encrypt Issue on Nginx Fix
 - Domain Edit Issue Fix
 
@@ -46,7 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Vendor Upgrade
 - Nginx Restart Issue Fix
 - Certbot vendor update
-- Minor Fixes
+- Minor Fixed
 
 ### Removed
 - PHP 7.3 from new installations

diff --git a/resources/views/server.blade.php b/resources/views/server.blade.php
@@ -49,22 +49,22 @@
             <div class="card-body">
                 <p>{{ __('cipi.server_name') }}:</p>
                 <div class="input-group">
-                    <input class="form-control" type="text" placeholder="Production" id="servername" autocomplete="off" />
+                    <input class="form-control" type="text" placeholder="e.g. Production" id="servername" autocomplete="off" />
                 </div>
                 <div class="space"></div>
                 <p>{{ __('cipi.server_ip') }}:</p>
                 <div class="input-group">
-                    <input class="form-control" type="text" placeholder="123.123.123.123" id="serverip" autocomplete="off" />
+                    <input class="form-control" type="text" placeholder="e.g. 123.123.123.123" id="serverip" autocomplete="off" />
                 </div>
                 <div class="space"></div>
                 <p>{{ __('cipi.server_provider') }}:</p>
                 <div class="input-group">
-                    <input class="form-control" type="text" placeholder="Digital Ocean" id="serverprovider" autocomplete="off" />
+                    <input class="form-control" type="text" placeholder="e.g. Digital Ocean" id="serverprovider" autocomplete="off" />
                 </div>
                 <div class="space"></div>
                 <p>{{ __('cipi.server_location') }}:</p>
                 <div class="input-group">
-                    <input class="form-control" type="text" placeholder="Amsterdam" id="serverlocation" autocomplete="off" />
+                    <input class="form-control" type="text" placeholder="e.g. Amsterdam" id="serverlocation" autocomplete="off" />
                 </div>
                 <div class="space"></div>
                 <div class="text-center">

diff --git a/resources/views/servers.blade.php b/resources/views/servers.blade.php
@@ -52,22 +52,22 @@
                 <div id="newserverform">
                     <label for="newservername">{{ __('cipi.server_name') }}</label>
                     <div class="input-group">
-                        <input class="form-control" type="text" id="newservername" placeholder="Production Server" autocomplete="off" />
+                        <input class="form-control" type="text" id="newservername" placeholder="e.g. Production" autocomplete="off" />
                     </div>
                     <div class="space"></div>
                     <label for="newserverip">{{ __('cipi.server_ip') }}</label>
                     <div class="input-group">
-                        <input class="form-control" type="text" id="newserverip" placeholder="123.45.67.89" autocomplete="off" />
+                        <input class="form-control" type="text" id="newserverip" placeholder="e.g. 123.45.67.89" autocomplete="off" />
                     </div>
                     <div class="space"></div>
                     <label for="newserverprovider">{{ __('cipi.server_provider') }}</label>
                     <div class="input-group">
-                        <input class="form-control" type="text" id="newserverprovider" placeholder="Digital Ocean" autocomplete="off" />
+                        <input class="form-control" type="text" id="newserverprovider" placeholder="e.g. Digital Ocean" autocomplete="off" />
                     </div>
                     <div class="space"></div>
                     <label for="newserverlocation">{{ __('cipi.server_location') }}</label>
                     <div class="input-group">
-                        <input class="form-control" type="text" id="newserverlocation" placeholder="Amsterdam" autocomplete="off" />
+                        <input class="form-control" type="text" id="newserverlocation" placeholder="e.g. Amsterdam" autocomplete="off" />
                     </div>
                     <div class="space"></div>
                     <div class="text-center">

diff --git a/resources/views/template.blade.php b/resources/views/template.blade.php
@@ -73,7 +73,7 @@
                                 {{ __('cipi.sidebar_menu.documentation') }}
                             </a>
                             <a class="nav-link" href="{{ config('cipi.app') }}" target="_blank">
-                                <div class="sb-nav-link-icon"><i class="fas fa-mobile-alt"></i></div>
+                                <div class="sb-nav-link-icon"><i class="fas fa-fw fa-mobile-alt"></i></div>
                                 {{ __('cipi.sidebar_menu.app') }}
                             </a>
                             <a class="nav-link" href="#" id="logout">

diff --git a/storage/app/cipi/version.md b/storage/app/cipi/version.md
@@ -1 +1 @@
-3.1.5
+3.1.6