Skip to content

A
academy-lms
Commit 0a261524 by Trần Văn Minh
Options

Merge branch 'dev' of http://git.dcv.vn/doanpv/academy-lms into dev 

# Conflicts:
#	application/language/vietnamese.json
parents a93d8e0d 7e73660d
Showing with 23 additions and 138 deletions
application/controllers/Checker.php
......@@ -7,7 +7,7 @@ if (!defined('BASEPATH'))
* Specification : Mobile app response, JSON formatted data for iOS & android app
* Ekattor School Management System Pro
* http://codecanyon.net/user/Creativeitem
* http://support.creativeitem.com
* http://ictlife.vn
*/
class Mobile extends CI_Controller
{
......
application/controllers/Install.php
......@@ -7,7 +7,7 @@ if (!defined('BASEPATH'))
* date : 07 october, 2018
* Academy
* http://codecanyon.net/user/Creativeitem
* http://support.creativeitem.com
* http://ictlife.vn
*/
ini_set('max_execution_time', 0);
......
application/controllers/Modal.php
......@@ -4,7 +4,7 @@
* date : 14 september, 2017
* Ekattor School Management System Pro
* http://codecanyon.net/user/Creativeitem
* http://support.creativeitem.com
* http://ictlife.vn
*/
class Modal extends CI_Controller {
......
application/controllers/Updater.php
......@@ -7,7 +7,7 @@ if (!defined('BASEPATH'))
* date : 7 October, 2018
* Academy
* http://codecanyon.net/user/Creativeitem
* http://support.creativeitem.com
* http://ictlife.vn
*/
class Updater extends CI_Controller
......
application/language/bengali.json deleted 100644 → 0
{
"language_deleted_successfully": "Language deleted successfully",
"multi_language_settings": "Multi language settings",
"admin": "Admin",
"welcome": "Welcome",
"my_account": "My account",
"settings": "Settings",
"logout": "Logout",
"visit_website": "Visit website",
"navigation": "Navigation",
"dashboard": "Dashboard",
"categories": "Categories",
"add_new_category": "Add new category",
"courses": "Courses",
"students": "Students",
"enrolment": "Enrolment",
"enrol_history": "Enrol history",
"enrol_a_student": "Enrol a student",
"report": "Report",
"admin_revenue": "Admin revenue",
"instructor_revenue": "Instructor revenue",
"message": "Message",
"system_settings": "System settings",
"website_settings": "Website settings",
"payment_settings": "Payment settings",
"instructor_settings": "Instructor settings",
"language_settings": "Language settings",
"smtp_settings": "Smtp settings",
"theme_settings": "Theme settings",
"about": "About",
"mobile_app": "Mobile app",
"manage_language": "Manage language",
"language_list": "Language list",
"add_phrase": "Add phrase",
"add_language": "Add language",
"language": "Language",
"option": "Option",
"edit_phrase": "Edit phrase",
"delete_language": "Delete language",
"add_new_phrase": "Add new phrase",
"save": "Save",
"add_new_language": "Add new language",
"no_special_character_or_space_is_allowed": "No special character or space is allowed",
"valid_examples": "Valid examples",
"phrase_updated": "Phrase updated",
"this_year": "This year",
"active_course": "Active course",
"pending_course": "Pending course",
"heads_up": "Heads up",
"congratulations": "Congratulations",
"oh_snap": "Oh snap",
"please_fill_all_the_required_fields": "Please fill all the required fields",
"close": "Close",
"are_you_sure": "Are you sure",
"cancel": "Cancel",
"continue": "Continue"
}
\ No newline at end of file
application/language/english.json
......@@ -187,7 +187,7 @@
"enrol": "Enrol",
"view_all_courses": "View all courses",
"get_category_wise_different_courses": "Get category wise different courses",
"terms_&_conditions": "Terms & conditions",
"terms___conditions": "Terms & conditions",
"version": "Version",
"added_to_cart": "Added to cart",
"checkout": "Checkout",
......
application/language/english/screen_lang.php
......@@ -194,7 +194,7 @@ $lang['add_to_cart'] = 'Add to cart';
$lang['enrol'] = 'Enrol';
$lang['view_all_courses'] = 'View all courses';
$lang['get_category_wise_different_courses'] = 'Get category wise different courses';
$lang['terms_&_conditions'] = 'Terms & conditions';
$lang['terms___conditions'] = 'Terms & conditions';
$lang['version'] = 'Version';
$lang['added_to_cart'] = 'Added to cart';
$lang['checkout'] = 'Checkout';
......
application/language/hebrew.json deleted 100644 → 0
{
"language_deleted_successfully": "Language deleted successfully",
"multi_language_settings": "Multi language settings",
"admin": "Admin",
"welcome": "Welcome",
"my_account": "My account",
"settings": "Settings",
"logout": "Logout",
"visit_website": "Visit website",
"navigation": "Navigation",
"dashboard": "Dashboard",
"categories": "Categories",
"add_new_category": "Add new category",
"courses": "Courses",
"students": "Students",
"enrolment": "Enrolment",
"enrol_history": "Enrol history",
"enrol_a_student": "Enrol a student",
"report": "Report",
"admin_revenue": "Admin revenue",
"instructor_revenue": "Instructor revenue",
"message": "Message",
"system_settings": "System settings",
"website_settings": "Website settings",
"payment_settings": "Payment settings",
"instructor_settings": "Instructor settings",
"language_settings": "Language settings",
"smtp_settings": "Smtp settings",
"theme_settings": "Theme settings",
"about": "About",
"mobile_app": "Mobile app",
"manage_language": "Manage language",
"language_list": "Language list",
"add_phrase": "Add phrase",
"add_language": "Add language",
"language": "Language",
"option": "Option",
"edit_phrase": "Edit phrase",
"delete_language": "Delete language",
"add_new_phrase": "Add new phrase",
"save": "Save",
"add_new_language": "Add new language",
"no_special_character_or_space_is_allowed": "No special character or space is allowed",
"valid_examples": "Valid examples",
"phrase_updated": "Phrase updated",
"this_year": "This year",
"active_course": "Active course",
"pending_course": "Pending course",
"heads_up": "Heads up",
"congratulations": "Congratulations",
"oh_snap": "Oh snap",
"please_fill_all_the_required_fields": "Please fill all the required fields",
"close": "Close",
"are_you_sure": "Are you sure",
"cancel": "Cancel",
"continue": "Continue",
"language_added_successfully": "Language added successfully"
}
\ No newline at end of file
application/language/vietnamese/screen_lang.php
......@@ -194,7 +194,7 @@ $lang['add_to_cart'] = 'Add to cart';
$lang['enrol'] = 'Enrol';
$lang['view_all_courses'] = 'View all courses';
$lang['get_category_wise_different_courses'] = 'Get category wise different courses';
$lang['terms_&_conditions'] = 'Terms & conditions';
$lang['terms___conditions'] = 'Terms & conditions';
$lang['version'] = 'Version';
$lang['added_to_cart'] = 'Added to cart';
$lang['checkout'] = 'Checkout';
......
application/views/backend/admin/about.php
......@@ -79,7 +79,7 @@
</p>
<p style="margin-top: 8px;">
<i class="mdi mdi-square"></i> <?php echo get_phrase('get_customer_support'); ?>
<span class="float-right"><a href="http://support.creativeitem.com" target="_blank" style="color: #343a40;"> <i class="mdi mdi-telegram"></i> <?php echo get_phrase('customer_support'); ?> </a> </span>
<span class="float-right"><a href="http://ictlife.vn" target="_blank" style="color: #343a40;"> <i class="mdi mdi-telegram"></i> <?php echo get_phrase('customer_support'); ?> </a> </span>
</p>
</div>
</div>
......
application/views/frontend/default/footer.php
......@@ -16,7 +16,7 @@
<a class="nav-link" href="<?php echo site_url('home/privacy_policy'); ?>"><?php echo get_phrase('privacy_policy'); ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo site_url('home/terms_and_condition'); ?>"><?php echo get_phrase('terms_&_condition'); ?></a>
<a class="nav-link" href="<?php echo site_url('home/terms_and_condition'); ?>"><?php echo get_phrase('terms___condition'); ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo site_url('home/login'); ?>">
......
assets/frontend/default/css/override-fe.css
.container-xl, nav.navbar {
.container-xl, nav.navbar, .footer-area {
background-color: #4d91ea !important;
color: white;
}
\ No newline at end of file
}
ul.footer-menu li a.nav-link { color: white !important; font-weight: bold }
\ No newline at end of file
update_pack/application/controllers/Checker.php
......@@ -7,7 +7,7 @@ if (!defined('BASEPATH'))
* Specification : Mobile app response, JSON formatted data for iOS & android app
* Ekattor School Management System Pro
* http://codecanyon.net/user/Creativeitem
* http://support.creativeitem.com
* http://ictlife.vn
*/
class Mobile extends CI_Controller
{
......
update_pack/application/controllers/Install.php
......@@ -7,7 +7,7 @@ if (!defined('BASEPATH'))
* date : 07 october, 2018
* Academy
* http://codecanyon.net/user/Creativeitem
* http://support.creativeitem.com
* http://ictlife.vn
*/
ini_set('max_execution_time', 0);
......
update_pack/application/controllers/Modal.php
......@@ -4,7 +4,7 @@
* date : 14 september, 2017
* Ekattor School Management System Pro
* http://codecanyon.net/user/Creativeitem
* http://support.creativeitem.com
* http://ictlife.vn
*/
class Modal extends CI_Controller {
......
update_pack/application/controllers/Updater.php
......@@ -7,7 +7,7 @@ if (!defined('BASEPATH'))
* date : 7 October, 2018
* Academy
* http://codecanyon.net/user/Creativeitem
* http://support.creativeitem.com
* http://ictlife.vn
*/
class Updater extends CI_Controller
......
update_pack/application/language/english.json
......@@ -187,7 +187,7 @@
"enrol": "Enrol",
"view_all_courses": "View all courses",
"get_category_wise_different_courses": "Get category wise different courses",
"terms_&_conditions": "Terms & conditions",
"terms___conditions": "Terms & conditions",
"version": "Version",
"added_to_cart": "Added to cart",
"checkout": "Checkout",
......
update_pack/application/language/hindi.json
......@@ -187,7 +187,7 @@
"enrol": "Enrol",
"view_all_courses": "View all courses",
"get_category_wise_different_courses": "Get category wise different courses",
"terms_&_conditions": "Terms & conditions",
"terms___conditions": "Terms & conditions",
"version": "Version",
"added_to_cart": "Added to cart",
"checkout": "Checkout",
......
update_pack/application/views/backend/admin/about.php
......@@ -79,7 +79,7 @@
</p>
<p style="margin-top: 8px;">
<i class="mdi mdi-square"></i> <?php echo get_phrase('get_customer_support'); ?>
<span class="float-right"><a href="http://support.creativeitem.com" target="_blank" style="color: #343a40;"> <i class="mdi mdi-telegram"></i> <?php echo get_phrase('customer_support'); ?> </a> </span>
<span class="float-right"><a href="http://ictlife.vn" target="_blank" style="color: #343a40;"> <i class="mdi mdi-telegram"></i> <?php echo get_phrase('customer_support'); ?> </a> </span>
</p>
</div>
</div>
......
update_pack/application/views/install/footer.php
<footer class="main"
style="text-align: center;">
Need help? <a href="http://support.creativeitem.com" target="_blank" style="text-decoration:underline;">Contact support</a>
Need help? <a href="http://ictlife.vn" target="_blank" style="text-decoration:underline;">Contact support</a>
</footer>
uploads/install.sql
......@@ -1006,7 +1006,7 @@ INSERT INTO `settings` (`id`, `key`, `value`) VALUES ('1', 'language', 'english'
('21', 'website_description', 'Nice application'),
('22', 'website_keywords', 'LMS,Learning Management System,Creativeitem,demo,hello,How are you'),
('23', 'footer_text', 'By Creativeitem'),
('24', 'footer_link', 'http://creativeitem.com/'),
('24', 'footer_link', 'http://ictlife.vn/'),
('25', 'protocol', 'smtp'),
('26', 'smtp_host', 'ssl://smtp.googlemail.com'),
('27', 'smtp_port', '465'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment