feat: branding and language improvements

- added helper for branding

- added new translations
This commit is contained in:
Aliberk Sandıkçı 2023-12-22 22:12:24 +03:00
parent 83f67b158a
commit 29c2d23008
Signed by: asandikci
GPG key ID: 25C67A03B5666BC1
28 changed files with 155 additions and 137 deletions

View file

@ -65,8 +65,7 @@ $autoload['libraries'] = ['database', 'session'];
| $autoload['helper'] = array('url', 'file');
*/
$autoload['helper'] = ['custom_exceptions', 'url', 'file', 'language', 'asset', 'config', 'render', 'rate_limit', 'security'];
$autoload['helper'] = ['iflrandevu/branding','custom_exceptions', 'url', 'file', 'language', 'asset', 'config', 'render', 'rate_limit', 'security'];
/*
| -------------------------------------------------------------------
@ -81,7 +80,7 @@ $autoload['helper'] = ['custom_exceptions', 'url', 'file', 'language', 'asset',
|
*/
$autoload['config'] = ['google', 'email'];
$autoload['config'] = ['email'];
/*
@ -97,7 +96,7 @@ $autoload['config'] = ['google', 'email'];
|
*/
$autoload['language'] = [];
$autoload['language'] = []; // see /application/core/EA_Controller.php for other added languages
/*

View file

@ -83,7 +83,7 @@ $config['url_suffix'] = '';
*/
$languages = [
'en' => 'english',
// 'en' => 'english',
'tr' => 'turkish',
];

View file

@ -82,5 +82,6 @@ class EA_Controller extends CI_Controller {
}
$this->lang->load('translations');
$this->lang->load('iflrandevu/translations');
}
}

View file

@ -0,0 +1,86 @@
<?php
/**
* Copyleft
*
* @package iflrandevu
* @author asandikci
* @copyright Copyleft (c) 2023 - 2024
* @license https://opensource.org/licenses/GPL-3.0 GPL3.0 License
* @link https://iflpanel.com/about/randevu
* @since Version 1.4.3
* @filesource
*/
use function PHPSTORM_META\type;
defined('BASEPATH') or exit('No direct script access allowed');
/**
* IFLRandevu Branding Helper
*
* @package iflrandevu
* @subpackage Helpers
* @category Helpers
* @author asandikci
*/
// ------------------------------------------------------------------------
if (!function_exists('branding')) {
/**
* Branding
* Update Branding
*
* @param string product
* @param string type
* @return string
*/
function branding($product, $type)
{
// Yazılım Sağlayıcı Bilgileri
$software = array(
"name" => "İFL Randevu",
"description" => "İzmir Fen Lisesi Randevu Portalı",
"maintainers" => "Aliberk Sandıı & Alex Tselegidis", // to also give credit to original maintainer
"maintainer_nickname" => "asandikci",
"maintainer_name" => "Aliberk Sandıı",
"maintainer_website" => "https://asandikci.com/",
"license" => "GPL3.0",
"website" => "https://iflpanel.com/about/iflrandevu",
"example" => "https://randevu.iflpanel.com/",
"source" => "https://git.aliberksandikci.com.tr/ifl/iflrandevu",
"issues" => "https://git.aliberksandikci.com.tr/ifl/iflrandevu/issues"
);
// Upstream Yazılım Sağlayıcı Bilgileri
$upstream = array (
"name" => "Easy!Appointments",
"description" => "Self Hosted Appointment Scheduler ",
"maintainer_nickname" => "alextselegidis",
"maintainer_name" => "Alex Tselegidis",
"maintainer_website" => "https://alextselegidis.com",
"license" => "GPL3.0",
"website" => "https://easyappointments.org",
"example" => "https://demo.easyappointments.org/",
"source" => "https://github.com/alextselegidis/easyappointments",
"issues" => "https://github.com/alextselegidis/easyappointments/issues",
);
switch ($product) {
case 'software':
return $software[$type];
break;
case 'type':
return $upstream[$type];
break;
}
}
}

View file

@ -0,0 +1,6 @@
<?php defined('BASEPATH') or exit('No direct script access allowed');
// Turkish
$lang['system_installation'] = 'System Installation';
$lang['system_installation_welcome_header'] = 'Welcome to the ' . branding("software", "name") . " installation page";
$lang['powered_by'] = 'Powered By <a href="' . branding("software", "website") . '" target="_blank">' . branding("software", "name") . '</a>';
// End

View file

@ -1,4 +0,0 @@
<?php defined('BASEPATH') OR exit('No direct script access allowed');
// Turkish
$lang['system_installation'] = 'System Installation';
// End

View file

@ -0,0 +1,6 @@
<?php defined('BASEPATH') OR exit('No direct script access allowed');
// Turkish
$lang['system_installation'] = 'Sistem Yüklemesi';
$lang['system_installation_welcome_header'] = branding("software", "name") . " sistem yükleme sayfasına hoşgeldiniz";
$lang['powered_by'] = '<a href="' . branding("software", "website") . '" target="_blank">' . branding("software", "name") . '</a> Gururla Sunar';
// End

View file

@ -1,4 +0,0 @@
<?php defined('BASEPATH') OR exit('No direct script access allowed');
// Turkish
$lang['system_installation'] = 'Sistem Yüklemesi';
// End

View file

@ -397,9 +397,7 @@
<div id="frame-footer">
<small>
<span class="footer-powered-by">
Powered By
<a href="https://easyappointments.org" target="_blank">Easy!Appointments</a>
<?= lang("powered_by") ?>
</span>
<span class="footer-options">

View file

@ -60,8 +60,7 @@
<div class="mt-2">
<small>
Powered by
<a href="https://easyappointments.org">Easy!Appointments</a>
<?= lang("powered_by") ?>
</small>
</div>
</div>

View file

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#35A768">
<title><?= $message_title ?> | Easy!Appointments</title>
<title><?= $message_title ?> | <?= branding("software", "name")?> </title>
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/ext/bootstrap/css/bootstrap.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/frontend.css') ?>">
@ -49,8 +49,7 @@
<div class="mt-2">
<small>
Powered by
<a href="https://easyappointments.org">Easy!Appointments</a>
<?= lang("powered_by") ?>
</small>
</div>
</div>

View file

@ -1,20 +1,20 @@
<div id="footer">
<div id="footer-content" class="col-12 col-sm-8">
<img class="mr-1" src="<?= base_url('assets/img/logo-16x16.png') ?>" alt="Easy!Appointments Logo">
<a href="https://easyappointments.org">
Easy!Appointments
<img class="mr-1" src="<?= base_url('assets/img/logo-16x16.png') ?>" alt="<?= branding("software", "name") ?> Logo">
<a href="<?= branding("software", "website") ?>">
<?= branding("software", "name") ?>
</a>
v<?= config('version') ?>
<?php if (config('release_label')): ?>
<?php if (config('release_label')) : ?>
- <?= config('release_label') ?>
<?php endif ?>
|
<img class="mx-1" src="<?= base_url('assets/img/alextselegidis-logo-16x16.png') ?>" alt="Alex Tselegidis Logo">
<a href="https://alextselegidis.com">
Alex Tselegidis
<img class="mx-1" src="<?= base_url('assets/img/' . branding("software", "maintainer_nickname") . '-logo-16x16.png') ?>" alt="<?= branding("software", "maintainer_name") ?> Logo">
<a href="<?= branding("software", "maintainer_website") ?>">
<?= branding("software", "maintainers") ?>
</a>
&copy; <?= date('Y') ?> - Software Development
@ -29,7 +29,7 @@
<span id="select-language" class="badge badge-secondary">
<i class="fas fa-language mr-2"></i>
<?= ucfirst(config('language')) ?>
<?= ucfirst(config('language')) ?>
</span>
|
@ -48,4 +48,5 @@
<script src="<?= asset_url('assets/js/polyfill.js') ?>"></script>
<script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
</body>
</html>

View file

@ -498,7 +498,7 @@
<!-- ABOUT TAB -->
<div class="tab-pane" id="about-app">
<h3>Easy!Appointments</h3>
<h3><?= branding("software", "name") ?></h3>
<p>
<?= lang('about_app_info') ?>
@ -518,25 +518,13 @@
<br><br>
<a href="https://easyappointments.org">
<a href="<?= branding("software", "website") ?>">
<?= lang('official_website') ?>
</a>
|
<a href="https://groups.google.com/forum/#!forum/easy-appointments">
<?= lang('support_group') ?>
</a>
|
<a href="https://github.com/alextselegidis/easyappointments/issues">
<a href="<?= branding("software", "issues") ?>">
<?= lang('project_issues') ?>
</a>
|
<a href="https://facebook.com/easyappts">
Facebook
</a>
|
<a href="https://twitter.com/easyappts">
Twitter
</a>
</p>
<h3><?= lang('license') ?></h3>

View file

@ -1,6 +1,6 @@
<html lang="en">
<head>
<title><?= lang('appointment_details_title') ?> | Easy!Appointments</title>
<title><?= lang('appointment_details_title') ?> | <?= branding("software", "name") ?>/title>
</head>
<body style="font: 13px arial, helvetica, tahoma;">
<div class="email-container" style="width: 650px; border: 1px solid #eee;">
@ -64,8 +64,7 @@
<div id="footer" style="padding: 10px; text-align: center; margin-top: 10px;
border-top: 1px solid #EEE; background: #FAFAFA;">
Powered by
<a href="https://easyappointments.org" style="text-decoration: none;">Easy!Appointments</a>
<?= lang("powered_by") ?>
|
<a href="<?= $company_link ?>" style="text-decoration: none;"><?= $company_name ?></a>
</div>

View file

@ -1,6 +1,6 @@
<html lang="en">
<head>
<title><?= lang('appointment_cancelled_title') ?> | Easy!Appointments</title>
<title><?= lang('appointment_cancelled_title') ?> | <?= branding("software", "name") ?></title>
</head>
<body style="font: 13px arial, helvetica, tahoma;">
<div class="email-container" style="width: 650px; border: 1px solid #eee;">
@ -64,8 +64,7 @@
<div id="footer" style="padding: 10px; text-align: center; margin-top: 10px;
border-top: 1px solid #EEE; background: #FAFAFA;">
Powered by
<a href="https://easyappointments.org" style="text-decoration: none;">Easy!Appointments</a>
<?= lang("powered_by") ?>
|
<a href="<?= $company_link ?>" style="text-decoration: none;"><?= $company_name ?></a>
</div>

View file

@ -1,6 +1,6 @@
<html lang="en">
<head>
<title>New Password | Easy!Appointments</title>
<title>New Password | <?= branding("software", "name") ?></title>
</head>
<body style="font: 13px arial, helvetica, tahoma;">
<div class="email-container" style="width: 650px; border: 1px solid #eee;">
@ -17,8 +17,7 @@
<div id="footer" style="padding: 10px; text-align: center; margin-top: 10px;
border-top: 1px solid #EEE; background: #FAFAFA;">
Powered by
<a href="https://easyappointments.org" style="text-decoration: none;">Easy!Appointments</a>
<?= lang("powered_by") ?>
|
<a href="<?= $company_link ?>" style="text-decoration: none;"><?= $company_name ?></a>
</div>

View file

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#35A768">
<title><?= lang('page_not_found') ?> | Easy!Appointments</title>
<title><?= lang('page_not_found') ?> | <?= branding("software", "name") ?></title>
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/ext/bootstrap/css/bootstrap.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/error404.css') ?>">
@ -47,8 +47,7 @@
<div class="mt-4">
<small>
Powered by
<a href="https://easyappointments.org">Easy!Appointments</a>
<?= lang("powered_by") ?>
</small>
</div>
</div>

View file

@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title> <?= lang('system_installation') ?> | <?= update_branding('GeneralServiceProvider')?></title>
<title> <?= lang('system_installation') ?> | <?= branding("software", "name")?></title>
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/ext/bootstrap/css/bootstrap.min.css') ?>">
<link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
@ -18,24 +18,24 @@
<header>
<div class="container">
<h1 class="page-title"><?= update_branding('GeneralServiceProvider')?> <?= lang('system_installation') ?></h1>
<h1 class="page-title"><?= branding("software", "name")?> <?= lang('system_installation') ?></h1>
</div>
</header>
<div class="content container">
<div class="welcome">
<h3>Welcome to the Easy!Appointments installation page.</h3>
<h3><?= lang('system_installation_welcome_header') ?></h3>
<p>
This page will help you set the main settings of your Easy!Appointments installation.
This page will help you set the main settings of your <?= branding("software", "name") ?> installation.
You will be able to edit these settings and many more in the backend session of your
system. Remember to use the <strong class="text-primary"><?= site_url('backend') ?></strong>
url to connect to the backend section of Easy!Appointments.
url to connect to the backend section of <?= branding("software", "name") ?>.
If you face any problems during the usage of Easy!Appointments you can always check the
If you face any problems during the usage of <?= branding("software", "name") ?> you can always check the
<a href="http://easyappointments.org/docs.html">Documentation</a>
and <a href="http://groups.google.com/group/easy-appointments">Support Group</a> for getting help. You
may also submit new issues on
<a href="https://github.com/alextselegidis/easyappointments/issues">GitHub Issues</a>
<a href="<?= branding("software", "issues") ?>">GitHub Issues</a>
in order to help our development process.
</p>
</div>
@ -115,8 +115,8 @@
<p>
<h3>License</h3>
Easy!Appointments is licensed under the <span class="badge badge-default">GPL-3.0 license</span>.
By using the code of Easy!Appointments in any way <br> you agree with the terms described in the
<?= branding("software", "name") ?> is licensed under the <span class="badge badge-default">GPL-3.0 license</span>.
By using the code of <?= branding("software", "name") ?> in any way <br> you agree with the terms described in the
following url:
<a href="https://www.gnu.org/licenses/gpl-3.0.en.html">https://www.gnu.org/licenses/gpl-3.0.en.html</a>
</p>
@ -125,12 +125,12 @@
<button type="button" id="install" class="btn btn-success btn-large">
<i class="icon-white icon-ok mr-2"></i>
Install Easy!Appointments
Install <?= branding("software", "name") ?>
</button>
</div>
<footer>
Powered by <a href="https://easyappointments.org">Easy!Appointments</a>
<?= lang("powered_by") ?>
</footer>
<script>

View file

@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>Update | Easy!Appointments</title>
<title>Update | <?= branding("software", "name") ?></title>
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/ext/bootstrap/css/bootstrap.min.css') ?>">
<link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
@ -14,7 +14,7 @@
<body>
<header>
<div class="container">
<h1 class="page-title">Easy!Appointments Update</h1>
<h1 class="page-title"><?= branding("software", "name") ?> Update</h1>
</div>
</header>
@ -29,7 +29,7 @@
</p>
<hr class="my-4">
<p>
You can now use the latest Easy!Appointments version.
You can now use the latest <?= branding("software", "name") ?> version.
</p>
<a href="<?= site_url('backend') ?>" class="btn btn-success btn-large">
<i class="fas fa-wrench mr-2"></i>
@ -65,7 +65,7 @@
</div>
<footer>
Powered by <a href="https://easyappointments.org">Easy!Appointments</a>
<?= lang("powered_by") ?>
</footer>
<script src="<?= asset_url('assets/ext/fontawesome/js/fontawesome.min.js') ?>"></script>

View file

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#35A768">
<title><?= lang('forgot_your_password') ?> | Easy!Appointments</title>
<title><?= lang('forgot_your_password') ?> | <?= branding("software", "name") ?></title>
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/ext/bootstrap/css/bootstrap.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/ext/jquery-ui/jquery-ui.min.css') ?>">
@ -61,8 +61,7 @@
<div class="mt-4">
<small>
Powered by
<a href="https://easyappointments.org">Easy!Appointments</a>
<?= lang("powered_by") ?>
</small>
</div>
</div>

View file

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#35A768">
<title><?= lang('login') ?> | Easy!Appointments</title>
<title><?= lang('login') ?> | <?= branding("software", "name") ?></title>
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/ext/jquery-ui/jquery-ui.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/ext/bootstrap/css/bootstrap.min.css') ?>">
@ -74,8 +74,7 @@
<div class="mt-4">
<small>
Powered by
<a href="https://easyappointments.org">Easy!Appointments</a>
<?= lang("powered_by") ?>
</small>
</div>
</form>

View file

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#35A768">
<title><?= lang('log_out') ?> | Easy!Appointments</title>
<title><?= lang('log_out') ?> | <?= branding("software", "name") ?></title>
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/ext/bootstrap/css/bootstrap.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/logout.css') ?>">
@ -45,8 +45,7 @@
<div class="mt-4">
<small>
Powered by
<a href="https://easyappointments.org">Easy!Appointments</a>
<?= lang("powered_by") ?>
</small>
</div>
</div>

View file

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#35A768">
<title><?= lang('no_privileges') ?> | Easy!Appointments</title>
<title><?= lang('no_privileges') ?> | <?= branding("software", "name") ?></title>
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/ext/bootstrap/css/bootstrap.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/no_privileges.css') ?>">
@ -34,8 +34,7 @@
<div class="mt-4">
<small>
Powered by
<a href="https://easyappointments.org">Easy!Appointments</a>
<?= lang("powered_by") ?>
</small>
</div>
</div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 678 B

View file

@ -1,6 +1,6 @@
<?php
/* ----------------------------------------------------------------------------
* Easy!Appointments - Open Source Web Scheduler
* İFL Randevu (fork of easy_appointments) - Open Source Web Scheduler
*
* @package EasyAppointments
* @author A.Tselegidis <alextselegidis@gmail.com>
@ -11,7 +11,7 @@
* ---------------------------------------------------------------------------- */
/**
* Easy!Appointments Configuration File
* İFL Randevu Configuration File
*
* Set your installation BASE_URL * without the trailing slash * and the database
* credentials in order to connect to the database. You can enable the DEBUG_MODE

View file

@ -1,5 +1,5 @@
/* ----------------------------------------------------------------------------
* Easy!Appointments - Open Source Web Scheduler
* İFL Randevu (fork of easy_appointments)- Open Source Web Scheduler
*
* @package EasyAppointments
* @author A.Tselegidis <alextselegidis@gmail.com>

View file

@ -38,10 +38,10 @@
/*
*---------------------------------------------------------------
* EASY!APPOINTMENTS CONFIGURATION
* İFL Randevu CONFIGURATION
*---------------------------------------------------------------
*
* Include Easy!Appointments configuration file so that it is available
* Include İFL Randevu configuration file so that it is available
* globally in the application. You can access configuration information
* through the static Config class.
*

View file

@ -1,49 +0,0 @@
<?php
/**
* Copyleft
*
* @package iflrandevu
* @author asandikci
* @copyright Copyleft (c) 2023 - 2024
* @license https://opensource.org/licenses/GPL-3.0 GPL3.0 License
* @link https://iflpanel.com/about/randevu
* @since Version 1.4.3
* @filesource
*/
use function PHPSTORM_META\type;
defined('BASEPATH') or exit('No direct script access allowed');
/**
* IFLRandevu Branding Helper
*
* @package iflrandevu
* @subpackage Helpers
* @category Helpers
* @author asandikci
*/
// ------------------------------------------------------------------------
if (!function_exists('update_branding')) {
/**
* Branding
* Update Branding
*
* @param string type
* @return string
*/
function update_branding($type)
{
$GeneralServiceProvider = "İFL Randevu";
if ($type == "GeneralServiceProvider"){
return $GeneralServiceProvider;
}
}
}