瀏覽代碼

Lots of small front end things

Lots of small front end things
Dennis 2 年之前
父節點
當前提交
ee56002e1a

+ 2 - 1
lang/en.json

@@ -324,7 +324,7 @@
     "System": "System",
     "Show Terms of Service": "Show Terms of Service",
     "Show the TOS link in the footer of every page. <br> Edit the content in \"resources\/views\/information\/tos-content.blade.php\"": "Show the TOS link in the footer of every page. <br> Edit the content in \"resources\/views\/information\/tos-content.blade.php\"",
-    "Show imprint": "Show imprint",
+    "Show Imprint": "Show Imprint",
     "Show the imprint link in the footer of every page. <br> Edit the content in \"resources\/views\/information\/imprint-content.blade.php\"": "Show the imprint link in the footer of every page. <br> Edit the content in \"resources\/views\/information\/imprint-content.blade.php\"",
     "Show Privacy Policy": "Show Privacy Policy",
     "Show the privacy policy link in the footer of every page. <br> Edit the content in \"resources\/views\/information\/privacy-content.blade.php\"": "Show the privacy policy link in the footer of every page. <br> Edit the content in \"resources\/views\/information\/privacy-content.blade.php\"",
@@ -535,6 +535,7 @@
     "MB": "MB",
     "MySQL": "MySQL",
     "ports": "ports",
+    "to create this server": "to create this server",
     "Server can´t fit on this node": "Server can´t fit on this node",
     "Not enough": "Not enough",
     "Create server": "Create server",

+ 1 - 1
themes/default/views/admin/overview/index.blade.php

@@ -59,7 +59,7 @@
 
                         <div class="info-box-content">
                             <span class="info-box-text">{{__('Servers')}}</span>
-                            <span class="info-box-number">{{$counters['servers']->total}}</span>
+                            <span class="info-box-number">{{$counters['servers']->active}}/{{$counters['servers']->total}}</span>
                         </div>
                         <!-- /.info-box-content -->
                     </div>

+ 2 - 2
themes/default/views/admin/partners/create.blade.php

@@ -58,7 +58,7 @@
                                 <div class="form-group">
                                     <label for="partner_discount">{{__('Partner discount')}}
                                         <i data-toggle="popover" data-trigger="hover"
-                                        data-content="{{__('The discount in percent given to the partner at checkout.')}}"
+                                        data-content="{{__('The discount in percent given to the partner when purchasing credits.')}}"
                                         class="fas fa-info-circle"></i>
                                     </label>
                                     <input value="{{old('partner_discount')}}" placeholder="{{__('Discount in percent')}}" id="partner_discount" name="partner_discount"
@@ -75,7 +75,7 @@
                                 <div class="form-group">
                                     <label for="registered_user_discount">{{__('Registered user discount')}}
                                         <i data-toggle="popover" data-trigger="hover"
-                                        data-content="{{__('The discount in percent given to all users registered using the partners referral link.')}}"
+                                        data-content="{{__('The discount in percent given to all users registered using the partners referral link when purchasing credits.')}}"
                                         class="fas fa-info-circle"></i>
                                     </label>
                                     <div class="input-group">

+ 1 - 1
themes/default/views/admin/settings/tabs/system.blade.php

@@ -33,7 +33,7 @@
                                 <input value="true" id="show-imprint" name="show-imprint"
                                     {{ config('SETTINGS::SYSTEM:SHOW_IMPRINT') == 'true' ? 'checked' : '' }}
                                     type="checkbox">
-                                <label for="show-imprint">{{ __('Show imprint') }} </label>
+                                <label for="show-imprint">{{ __('Show Imprint') }} </label>
                             </div>
                             <i data-toggle="popover" data-trigger="hover" data-html="true"
                                 data-content="{{ __('Show the imprint link in the footer of every page. <br> Edit the content in <b>'.Qirolab\Theme\Theme::path($path = "views").'/resources/views/information/imprint-content.blade.php</b>') }}"

+ 5 - 0
themes/default/views/servers/create.blade.php

@@ -206,6 +206,11 @@
                                                         ({{ __('ports') }})</span>
                                                     <span class="d-inline-block" x-text="product.allocations"></span>
                                                 </li>
+                                                <li class="d-flex justify-content-between">
+                                                    <span class="d-inline-block"><i class="fa fa-coins"></i>
+                                                        {{ __('Required') }} {{ CREDITS_DISPLAY_NAME }} {{ __('to create this server') }}</span>
+                                                    <span class="d-inline-block" x-text="product.minimum_credits === -1 ? {{ config('SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER') }} : product.minimum_credit"></span>
+                                                </li>
                                             </ul>
                                         </div>
                                         <div class="mt-2 mb-2">