From 1afa84e36f72cef99e838e1810c22cd5f7867ba8 Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Mon, 17 Oct 2022 11:57:39 +0700 Subject: [PATCH] fixlogin and panel-primary --- docs/diskusi.html | 2 +- system/lan/indonesia/common.lan.php | 3 + ui/ui/app-localisation.tpl | 2 +- ui/ui/app-settings.tpl | 2 +- ui/ui/bandwidth-add.tpl | 2 +- ui/ui/bandwidth-edit.tpl | 2 +- ui/ui/bandwidth.tpl | 4 +- ui/ui/change-password.tpl | 2 +- ui/ui/community.tpl | 58 ++++++------ ui/ui/customers-add.tpl | 2 +- ui/ui/customers-edit.tpl | 2 +- ui/ui/customers.tpl | 4 +- ui/ui/dbstatus.tpl | 4 +- ui/ui/hotspot-add.tpl | 2 +- ui/ui/hotspot-edit.tpl | 2 +- ui/ui/hotspot.tpl | 4 +- ui/ui/invoice.tpl | 2 +- ui/ui/language-add.tpl | 2 +- ui/ui/pool-add.tpl | 2 +- ui/ui/pool-edit.tpl | 2 +- ui/ui/pool.tpl | 4 +- ui/ui/pppoe-add.tpl | 2 +- ui/ui/pppoe-edit.tpl | 2 +- ui/ui/pppoe.tpl | 4 +- ui/ui/prepaid-edit.tpl | 2 +- ui/ui/prepaid.tpl | 4 +- ui/ui/recharge-user.tpl | 2 +- ui/ui/recharge.tpl | 2 +- ui/ui/refill.tpl | 2 +- ui/ui/register-otp.tpl | 62 +++++------- ui/ui/register-rotp.tpl | 30 +++--- ui/ui/register.tpl | 20 +--- ui/ui/reports-daily.tpl | 2 +- ui/ui/reports-period-view.tpl | 2 +- ui/ui/reports-period.tpl | 12 +-- ui/ui/routers-add.tpl | 2 +- ui/ui/routers-edit.tpl | 2 +- ui/ui/routers.tpl | 4 +- ui/ui/sections/header.tpl | 2 +- ui/ui/user-activation-list.tpl | 4 +- ui/ui/user-change-password.tpl | 2 +- ui/ui/user-dashboard.tpl | 2 +- ui/ui/user-login.tpl | 141 ++++++++++++++-------------- ui/ui/user-orderHistory.tpl | 4 +- ui/ui/user-orderPlan.tpl | 2 +- ui/ui/user-orderView.tpl | 6 +- ui/ui/user-profile.tpl | 2 +- ui/ui/users-add.tpl | 2 +- ui/ui/users-edit.tpl | 2 +- ui/ui/users.tpl | 4 +- ui/ui/voucher-add.tpl | 2 +- ui/ui/voucher.tpl | 4 +- 52 files changed, 210 insertions(+), 234 deletions(-) diff --git a/docs/diskusi.html b/docs/diskusi.html index 3eb824ef..20541df7 100644 --- a/docs/diskusi.html +++ b/docs/diskusi.html @@ -45,7 +45,7 @@
-
+
Public Disquss
diff --git a/system/lan/indonesia/common.lan.php b/system/lan/indonesia/common.lan.php index f886469d..a3710afb 100644 --- a/system/lan/indonesia/common.lan.php +++ b/system/lan/indonesia/common.lan.php @@ -301,3 +301,6 @@ $_L['Buy_Package'] = 'Buy Package'; $_L['Email'] = 'Email'; $_L['Company_Footer'] = 'Company Footer'; $_L['Will_show_below_user_pages'] = 'Will show below user pages'; +$_L['Request_OTP'] = 'Request OTP'; +$_L['Verification_Code'] = 'Verification Code'; +$_L['SMS_Verification_Code'] = 'SMS Verification Code'; diff --git a/ui/ui/app-localisation.tpl b/ui/ui/app-localisation.tpl index ef209449..ebbc960a 100644 --- a/ui/ui/app-localisation.tpl +++ b/ui/ui/app-localisation.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Localisation']}
diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl index 3ea3ad14..de141b9a 100644 --- a/ui/ui/app-settings.tpl +++ b/ui/ui/app-settings.tpl @@ -3,7 +3,7 @@
-
+
{$_L['General_Settings']}
diff --git a/ui/ui/bandwidth-add.tpl b/ui/ui/bandwidth-add.tpl index 35b67551..b442d41b 100644 --- a/ui/ui/bandwidth-add.tpl +++ b/ui/ui/bandwidth-add.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Add_Bandwidth']}
diff --git a/ui/ui/bandwidth-edit.tpl b/ui/ui/bandwidth-edit.tpl index 4a79c43f..40921950 100644 --- a/ui/ui/bandwidth-edit.tpl +++ b/ui/ui/bandwidth-edit.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Edit_Bandwidth']}
diff --git a/ui/ui/bandwidth.tpl b/ui/ui/bandwidth.tpl index f80ae766..166ab486 100644 --- a/ui/ui/bandwidth.tpl +++ b/ui/ui/bandwidth.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Bandwidth_Plans']}
@@ -24,7 +24,7 @@
 
- +
diff --git a/ui/ui/change-password.tpl b/ui/ui/change-password.tpl index 3e592f9e..bc08c627 100644 --- a/ui/ui/change-password.tpl +++ b/ui/ui/change-password.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Change_Password']}
diff --git a/ui/ui/community.tpl b/ui/ui/community.tpl index 364ab0eb..6c6b92fd 100644 --- a/ui/ui/community.tpl +++ b/ui/ui/community.tpl @@ -2,22 +2,22 @@
-
-
Discussions
-
Get help from community
-
+
+

Discussions

+
Get help from community
+
Chat Now
-
-
Feedback
-
+
+

Feedback

+
Feedback and Bug Report
-
+
Give Feedback
@@ -27,12 +27,12 @@
-
-
Donasi
-
Untuk pengembangan lebih baik, donasi ke iBNuX, donasi akan membantu terus +
+

Donasi

+
Untuk pengembangan lebih baik, donasi ke iBNuX, donasi akan membantu terus pengembangan aplikasi
-
{$_L['BW_Name']}
+
@@ -49,7 +49,7 @@
BCA
-
+
Trakteer
-
-
Donations
-
+
+

Donations

+
Donations will help to continue phpnuxbill development
- +
@@ -85,7 +85,7 @@
Bank Central Asia
-
+
Paypal
@@ -93,10 +93,10 @@
-
-
Chat with me
-
Paid Support?
donation confirmation?
Or ask any Donation Alternative
-
+
+

Chat with me

+
Paid Support?
donation confirmation?
Or ask any Donation Alternative
+
Telegram Twitter @@ -107,14 +107,14 @@
-
-
PHPNUXBILL
-
+
+

PHPNUXBILL

+
{$_L['Welcome_Text_Admin']}
- - -
+ + +
Get Latest Version
@@ -125,7 +125,7 @@ $.getJSON( "./version.json?"+Math.random(), function( data ) { $('#currentVersion').html('Current Version: '+data.version); }); - $.getJSON( "https://raw.githubusercontent.com/ibnux/phpnuxbill/master/version.json?"+Math.random(), function( data ) { + $.getJSON( "https://raw.githubusercontent.com/hotspotbilling/phpnuxbill/master/version.json?"+Math.random(), function( data ) { $('#latestVersion').html('Latest Version: '+data.version); }); }); diff --git a/ui/ui/customers-add.tpl b/ui/ui/customers-add.tpl index 4a36329d..0d4ecb9d 100644 --- a/ui/ui/customers-add.tpl +++ b/ui/ui/customers-add.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Add_Contact']}
diff --git a/ui/ui/customers-edit.tpl b/ui/ui/customers-edit.tpl index 3b1b7746..8677665b 100644 --- a/ui/ui/customers-edit.tpl +++ b/ui/ui/customers-edit.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Edit_Contact']}
diff --git a/ui/ui/customers.tpl b/ui/ui/customers.tpl index 595c537a..7ede1915 100644 --- a/ui/ui/customers.tpl +++ b/ui/ui/customers.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Manage_Accounts']}
@@ -24,7 +24,7 @@
 
- +
diff --git a/ui/ui/dbstatus.tpl b/ui/ui/dbstatus.tpl index 3b1baa46..2568d16c 100644 --- a/ui/ui/dbstatus.tpl +++ b/ui/ui/dbstatus.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Database_Status']}
@@ -13,7 +13,7 @@ {$_L['Download_Database_Backup']}
 
-
{$_L['Username']}
+
diff --git a/ui/ui/hotspot-add.tpl b/ui/ui/hotspot-add.tpl index 3a363fe9..4477bcfc 100644 --- a/ui/ui/hotspot-add.tpl +++ b/ui/ui/hotspot-add.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Add_Plan']}
diff --git a/ui/ui/hotspot-edit.tpl b/ui/ui/hotspot-edit.tpl index ddd6b18e..b6387279 100644 --- a/ui/ui/hotspot-edit.tpl +++ b/ui/ui/hotspot-edit.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Edit_Plan']}
diff --git a/ui/ui/hotspot.tpl b/ui/ui/hotspot.tpl index 42b26a9d..faa857ce 100644 --- a/ui/ui/hotspot.tpl +++ b/ui/ui/hotspot.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Hotspot_Plans']}
@@ -24,7 +24,7 @@
 
-
{$_L['Table_Name']}
+
diff --git a/ui/ui/invoice.tpl b/ui/ui/invoice.tpl index 81cb0985..9b190cc3 100644 --- a/ui/ui/invoice.tpl +++ b/ui/ui/invoice.tpl @@ -2,7 +2,7 @@
-
+
PRINT INVOICE
diff --git a/ui/ui/language-add.tpl b/ui/ui/language-add.tpl index 11e43623..8a0c909d 100644 --- a/ui/ui/language-add.tpl +++ b/ui/ui/language-add.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Add_Plan']}
diff --git a/ui/ui/pool-add.tpl b/ui/ui/pool-add.tpl index 2ac2bf95..576f26ba 100644 --- a/ui/ui/pool-add.tpl +++ b/ui/ui/pool-add.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Add_Pool']}
diff --git a/ui/ui/pool-edit.tpl b/ui/ui/pool-edit.tpl index af2d87d4..33112828 100644 --- a/ui/ui/pool-edit.tpl +++ b/ui/ui/pool-edit.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Edit_Pool']}
diff --git a/ui/ui/pool.tpl b/ui/ui/pool.tpl index 61d18945..82114b24 100644 --- a/ui/ui/pool.tpl +++ b/ui/ui/pool.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Pool']}
@@ -24,7 +24,7 @@
 
-
{$_L['Plan_Name']}
+
diff --git a/ui/ui/pppoe-add.tpl b/ui/ui/pppoe-add.tpl index 20034ae1..fbe86a6c 100644 --- a/ui/ui/pppoe-add.tpl +++ b/ui/ui/pppoe-add.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Add_Plan']}
diff --git a/ui/ui/pppoe-edit.tpl b/ui/ui/pppoe-edit.tpl index 3ad69f9d..b710db45 100644 --- a/ui/ui/pppoe-edit.tpl +++ b/ui/ui/pppoe-edit.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Edit_Plan']}
diff --git a/ui/ui/pppoe.tpl b/ui/ui/pppoe.tpl index aec4fef7..a0ed186e 100644 --- a/ui/ui/pppoe.tpl +++ b/ui/ui/pppoe.tpl @@ -2,7 +2,7 @@
-
+
{$_L['PPPOE_Plans']}
@@ -24,7 +24,7 @@
 
-
#
+
diff --git a/ui/ui/prepaid-edit.tpl b/ui/ui/prepaid-edit.tpl index 87901bd4..654ef453 100644 --- a/ui/ui/prepaid-edit.tpl +++ b/ui/ui/prepaid-edit.tpl @@ -2,7 +2,7 @@
-
+

{$_L['Recharge_Account']}

diff --git a/ui/ui/prepaid.tpl b/ui/ui/prepaid.tpl index 16c861ed..fcde4cd3 100644 --- a/ui/ui/prepaid.tpl +++ b/ui/ui/prepaid.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Prepaid_User']}
@@ -24,7 +24,7 @@
 
-
{$_L['Plan_Name']}
+
diff --git a/ui/ui/recharge-user.tpl b/ui/ui/recharge-user.tpl index 80f25e97..3a3c3018 100644 --- a/ui/ui/recharge-user.tpl +++ b/ui/ui/recharge-user.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Recharge_Account']}
diff --git a/ui/ui/recharge.tpl b/ui/ui/recharge.tpl index 6cc8e4d2..a7625cd7 100644 --- a/ui/ui/recharge.tpl +++ b/ui/ui/recharge.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Recharge_Account']}
diff --git a/ui/ui/refill.tpl b/ui/ui/refill.tpl index 87f95e23..aab30e72 100644 --- a/ui/ui/refill.tpl +++ b/ui/ui/refill.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Recharge_Account']}
diff --git a/ui/ui/register-otp.tpl b/ui/ui/register-otp.tpl index 0135257c..4805ea61 100644 --- a/ui/ui/register-otp.tpl +++ b/ui/ui/register-otp.tpl @@ -7,20 +7,8 @@ {$_title} - {$_L['Register']} - - - - - - - - - - - - - + @@ -42,54 +30,54 @@ {/if}
-
+
{$_L['Registration_Info']}
-
+
{include file="$_path/../pages/Registration_Info.html"}
- +
-
+
1. {$_L['Register_Member']}
-
- + + -
-
- - +
+ +
-
- + + -
-
- - +
+ +
-
+
2. {$_L['Password']}
-
- - +
+ +
-
- - +
+ +
diff --git a/ui/ui/register-rotp.tpl b/ui/ui/register-rotp.tpl index 5df8dac6..e24b6c72 100644 --- a/ui/ui/register-rotp.tpl +++ b/ui/ui/register-rotp.tpl @@ -44,32 +44,30 @@
-
+
{$_L['Registration_Info']}
{include file="$_path/../pages/Registration_Info.html"}
- +
-
+
1. {$_L['Register_Member']}
-
-
- - +
+ + +
+
+
+
-
-
- -
-
- {$_L['Cancel']} -
+
+ {$_L['Cancel']}
diff --git a/ui/ui/register.tpl b/ui/ui/register.tpl index 73405275..f56d91b2 100644 --- a/ui/ui/register.tpl +++ b/ui/ui/register.tpl @@ -7,20 +7,8 @@ {$_title} - {$_L['Register']} - - - - - - - - - - - - - + @@ -42,7 +30,7 @@ {/if}
-
+
{$_L['Registration_Info']}
{include file="$_path/../pages/Registration_Info.html"} @@ -51,7 +39,7 @@
-
+
1. {$_L['Register_Member']}
@@ -74,7 +62,7 @@
-
+
2. {$_L['Password']}
diff --git a/ui/ui/reports-daily.tpl b/ui/ui/reports-daily.tpl index a3991ea9..fcab5545 100644 --- a/ui/ui/reports-daily.tpl +++ b/ui/ui/reports-daily.tpl @@ -22,7 +22,7 @@
-
{$_L['Username']}
+
diff --git a/ui/ui/reports-period-view.tpl b/ui/ui/reports-period-view.tpl index 64c73da5..747fbfe5 100644 --- a/ui/ui/reports-period-view.tpl +++ b/ui/ui/reports-period-view.tpl @@ -33,7 +33,7 @@
-
{$_L['Username']}
+
diff --git a/ui/ui/reports-period.tpl b/ui/ui/reports-period.tpl index 83688c76..a1926078 100644 --- a/ui/ui/reports-period.tpl +++ b/ui/ui/reports-period.tpl @@ -3,16 +3,16 @@
-
+
{$_L['Period_Reports']}
-
- - +
+ +
@@ -20,8 +20,8 @@
- - + +
diff --git a/ui/ui/routers-add.tpl b/ui/ui/routers-add.tpl index 78238993..d5e2ffca 100644 --- a/ui/ui/routers-add.tpl +++ b/ui/ui/routers-add.tpl @@ -3,7 +3,7 @@
-
+
{$_L['Add_Router']}
diff --git a/ui/ui/routers-edit.tpl b/ui/ui/routers-edit.tpl index fcf137c4..e33d0327 100644 --- a/ui/ui/routers-edit.tpl +++ b/ui/ui/routers-edit.tpl @@ -3,7 +3,7 @@
-
+
{$_L['Edit_Router']}
diff --git a/ui/ui/routers.tpl b/ui/ui/routers.tpl index 00bbba91..d37d4a8b 100644 --- a/ui/ui/routers.tpl +++ b/ui/ui/routers.tpl @@ -3,7 +3,7 @@
-
+
{$_L['Routers']}
@@ -28,7 +28,7 @@
 
-
{$_L['Username']}
+
diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl index 7ed7932d..8fb9c858 100644 --- a/ui/ui/sections/header.tpl +++ b/ui/ui/sections/header.tpl @@ -240,7 +240,7 @@

- Dashboard + {$_title}

diff --git a/ui/ui/user-activation-list.tpl b/ui/ui/user-activation-list.tpl index 1d5459ed..cbb62d88 100644 --- a/ui/ui/user-activation-list.tpl +++ b/ui/ui/user-activation-list.tpl @@ -3,11 +3,11 @@
-
+
{$_L['List_Activated_Voucher']}
-
{$_L['Router_Name']}
+
diff --git a/ui/ui/user-change-password.tpl b/ui/ui/user-change-password.tpl index f30701a9..880fb24a 100644 --- a/ui/ui/user-change-password.tpl +++ b/ui/ui/user-change-password.tpl @@ -3,7 +3,7 @@
-
+
{$_L['Change_Password']}
diff --git a/ui/ui/user-dashboard.tpl b/ui/ui/user-dashboard.tpl index 4b04b767..561c6cf4 100644 --- a/ui/ui/user-dashboard.tpl +++ b/ui/ui/user-dashboard.tpl @@ -51,7 +51,7 @@

{$_L['Account_Information']}

-
{$_L['Username']}
+
diff --git a/ui/ui/user-login.tpl b/ui/ui/user-login.tpl index a54372e4..989f6913 100644 --- a/ui/ui/user-login.tpl +++ b/ui/ui/user-login.tpl @@ -1,81 +1,80 @@ + - - - {$_title} - {$_L['Login']} - + + + {$_title} - {$_L['Login']} + - - - - - - + + + -
- -
-

{$_c['CompanyName']}

-
-
- {if isset($notify)} -
-
- {$notify} -
-
- {/if} -
-
-
-
{$_L['Announcement']}
-
- {include file="$_path/../pages/Announcement.html"} -
-
-
-
-
-
{$_L['Sign_In_Member']}
-
-
- -
- - -
+
+ +
+

{$_c['CompanyName']}

+
+
+ {if isset($notify)} +
+
+ {$notify} +
+
+ {/if} +
+
+
+
{$_L['Announcement']}
+
+ {include file="$_path/../pages/Announcement.html"} +
+
+
+
+
+
{$_L['Sign_In_Member']}
+
+ +
+ + +
+
+ + +
-
- - -
- - -
-
- -
-
- {$_L['Register']} -
-
- -
-
-
-
-
-
- + +
+
+ +
+
+ {$_L['Register']} +
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/ui/ui/user-orderHistory.tpl b/ui/ui/user-orderHistory.tpl index 3bf36d3d..97c4dcc2 100644 --- a/ui/ui/user-orderHistory.tpl +++ b/ui/ui/user-orderHistory.tpl @@ -3,11 +3,11 @@
-
+
{$_L['Order_History']}
-
{$_L['Username']} {$_bill['username']}
+
diff --git a/ui/ui/user-orderPlan.tpl b/ui/ui/user-orderPlan.tpl index 84a87d74..6b790f77 100644 --- a/ui/ui/user-orderPlan.tpl +++ b/ui/ui/user-orderPlan.tpl @@ -21,7 +21,7 @@
{$plan['name_plan']}
-
{$_L['Plan_Name']}
+
diff --git a/ui/ui/user-orderView.tpl b/ui/ui/user-orderView.tpl index f630c58e..5373a6eb 100644 --- a/ui/ui/user-orderView.tpl +++ b/ui/ui/user-orderView.tpl @@ -3,10 +3,10 @@
-
+
Transaction #{$trx['id']}
-
+
{$router['name']}
{$router['description']} @@ -14,7 +14,7 @@
-
{Lang::T('Type')}
+
diff --git a/ui/ui/user-profile.tpl b/ui/ui/user-profile.tpl index 0edc19c5..83af1118 100644 --- a/ui/ui/user-profile.tpl +++ b/ui/ui/user-profile.tpl @@ -3,7 +3,7 @@
-
+
{$_L['Edit_User']}
diff --git a/ui/ui/users-add.tpl b/ui/ui/users-add.tpl index b93f9fa1..7259ddf8 100644 --- a/ui/ui/users-add.tpl +++ b/ui/ui/users-add.tpl @@ -3,7 +3,7 @@
-
+
{$_L['Add_New_Administrator']}
diff --git a/ui/ui/users-edit.tpl b/ui/ui/users-edit.tpl index 9cb74ce9..d1e26e23 100644 --- a/ui/ui/users-edit.tpl +++ b/ui/ui/users-edit.tpl @@ -3,7 +3,7 @@
-
+
{$_L['Edit_User']}
diff --git a/ui/ui/users.tpl b/ui/ui/users.tpl index 9a2936c5..0be15f64 100644 --- a/ui/ui/users.tpl +++ b/ui/ui/users.tpl @@ -3,7 +3,7 @@
-
+
{$_L['Manage_Administrator']}
@@ -27,7 +27,7 @@
 
-
{Lang::T('Status')}
+
diff --git a/ui/ui/voucher-add.tpl b/ui/ui/voucher-add.tpl index fceced69..9e229ecc 100644 --- a/ui/ui/voucher-add.tpl +++ b/ui/ui/voucher-add.tpl @@ -3,7 +3,7 @@
-
+
{$_L['Add_Voucher']}
diff --git a/ui/ui/voucher.tpl b/ui/ui/voucher.tpl index 02a74d8f..c989fcc3 100644 --- a/ui/ui/voucher.tpl +++ b/ui/ui/voucher.tpl @@ -2,7 +2,7 @@
-
+
{$_L['Prepaid_Vouchers']}
@@ -34,7 +34,7 @@
 
-
{$_L['Username']}
+
ID