hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #706 from openclassify/dia

Browse Source 
#2231 Panel Logo Değişecek
This commit is contained in:
Fatih Alp 2020-10-07 11:14:43 +03:00 committed by GitHub
commit 4a7aae8899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
View File

@ -2,6 +2,7 @@
use Anomaly\Streams\Platform\Image\Command\MakeImageInstance;
use Anomaly\Streams\Platform\Model\Advs\AdvsCustomFieldsEntryModel;
use Carbon\Carbon;
use GuzzleHttp\Client;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
@ -371,4 +372,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
$neighborhood = $neighborhoodModel->newQuery()->find($this->neighborhood);
return $neighborhood ? $neighborhood->name : false;
}
public function expired()
{
return $this->finish_at ? $this->finish_at < Carbon::now() : true;
}
}

1
addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
View File

@ -4,4 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
interface AdvInterface extends EntryInterface
{
public function expired();
}

2
addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
View File

@ -433,7 +433,7 @@ class AdvsController extends PublicController
$adv = $this->adv_repository->getListItemAdv($id);
if ($adv) {
if ($adv && !$adv->expired()) {
if ($this->adv_model->is_enabled('complaints')) {
$complaints = ComplaintsComplainTypesEntryModel::all();

4
addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
View File

@ -223,6 +223,8 @@
height: 40px;
margin-top: -9px;
vertical-align: middle;
object-fit: contain;
object-position: center;
}
#topbar .logo svg .st0 {
transition: fill 300ms 500ms;
@ -2670,6 +2672,8 @@ body {
max-height: 82px;
margin-top: -30px;
vertical-align: middle;
object-fit: contain;
object-position: center;
}
#login .logo svg .st0 {
fill: #ffffff;

19
addons/default/visiosoft/defaultadmin-theme/resources/img/login-icon.svg Normal file
View File

@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="25.7" viewBox="0 0 40 25.7">
<defs>
<linearGradient id="linear-gradient" x1="0.906" y1="0.743" x2="0.193" y2="0.743" gradientUnits="objectBoundingBox">
<stop offset="0" stop-color="#fff"/>
<stop offset="1" stop-color="#c6c4c4"/>
</linearGradient>
<linearGradient id="linear-gradient-2" x1="0.367" y1="0.156" x2="0.779" y2="0.997" xlink:href="#linear-gradient"/>
<linearGradient id="linear-gradient-3" x1="0.26" y1="0.715" x2="0.846" y2="0.216" xlink:href="#linear-gradient"/>
</defs>
<g id="oc_logo2" data-name="oc logo2" transform="translate(16875 -4360)">
<rect id="Rectangle_166" data-name="Rectangle 166" width="40" height="25.7" transform="translate(-16875 4360)" fill="#e2c756" opacity="0"/>
<g id="Group_16415" data-name="Group 16415" transform="translate(365.099 -0.303)">
<path id="Union_162" data-name="Union 162" d="M12.825,25.7h0ZM0,12.85a12.818,12.818,0,1,1,23.489,7.109,8.4,8.4,0,0,0-3.2-.69H16.277a7.31,7.31,0,1,0-3.555.882h6.534c4.015,0,7.851,4.117,7.851,5.549H12.774A12.818,12.818,0,0,1,0,12.85Z" transform="translate(-17233.715 4360.303)" fill="#fff"/>
<path id="Path_10942" data-name="Path 10942" d="M10721.25,13446.668a12.819,12.819,0,0,0,1.842-9.667,23.11,23.11,0,0,1-7.479,7.774,7.484,7.484,0,0,1-1.612,1.177h4A8.2,8.2,0,0,1,10721.25,13446.668Z" transform="translate(-27931.426 -9066.381)" opacity="0.49" fill="url(#linear-gradient)"/>
<path id="Path_10943" data-name="Path 10943" d="M9615.6,12634a12.736,12.736,0,0,0-9.6,5.741,22.812,22.812,0,0,1,10.778-.205,7.232,7.232,0,0,1,5.2,2.288A20.176,20.176,0,0,0,9615.6,12634Z" transform="translate(-26837.588 -8273.647)" opacity="0.49" fill="url(#linear-gradient-2)"/>
<path id="Path_10944" data-name="Path 10944" d="M9499,13345.158a12.865,12.865,0,0,0,8.006,7.852,23.372,23.372,0,0,1-3.057-10.4,7.239,7.239,0,0,1,.869-5.612A19.873,19.873,0,0,0,9499,13345.158Z" transform="translate(-26731.959 -8967.659)" opacity="0.49" fill="url(#linear-gradient-3)"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

21
addons/default/visiosoft/defaultadmin-theme/resources/img/panel-icon.svg Normal file
View File

@ -0,0 +1,21 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="25.7" viewBox="0 0 40 25.7">
<defs>
<linearGradient id="linear-gradient" x1="0.906" y1="0.743" x2="0.193" y2="0.743" gradientUnits="objectBoundingBox">
<stop offset="0" stop-color="#22547c"/>
<stop offset="1" stop-color="#0e3c61"/>
</linearGradient>
<linearGradient id="linear-gradient-2" x1="0.367" y1="0.156" x2="0.779" y2="0.997" xlink:href="#linear-gradient"/>
<linearGradient id="linear-gradient-3" x1="0.26" y1="0.715" x2="0.846" y2="0.216" xlink:href="#linear-gradient"/>
</defs>
<g id="oc_logo1" data-name="oc logo1" transform="translate(16924 -4360)">
<rect id="Rectangle_165" data-name="Rectangle 165" width="40" height="25.7" transform="translate(-16924 4360)" fill="#e2c756" opacity="0"/>
<g id="Group_16418" data-name="Group 16418" transform="translate(-16917.654 4360)">
<g id="Group_16370" data-name="Group 16370" transform="translate(0 0)">
<path id="Union_161" data-name="Union 161" d="M12.825,25.7h0ZM0,12.85a12.818,12.818,0,1,1,23.489,7.109,8.4,8.4,0,0,0-3.2-.69H16.277a7.31,7.31,0,1,0-3.555.882h6.534c4.015,0,7.851,4.117,7.851,5.549H12.774A12.818,12.818,0,0,1,0,12.85Z" fill="#22547c"/>
<path id="Path_4453" data-name="Path 4453" d="M10721.249,13446.667a12.814,12.814,0,0,0,1.841-9.667,23.133,23.133,0,0,1-7.479,7.775,7.526,7.526,0,0,1-1.61,1.176h4A8.229,8.229,0,0,1,10721.249,13446.667Z" transform="translate(-10697.711 -13426.683)" opacity="0.49" fill="url(#linear-gradient)"/>
<path id="Path_4455" data-name="Path 4455" d="M9615.6,12634a12.748,12.748,0,0,0-9.6,5.741,22.838,22.838,0,0,1,10.778-.205,7.235,7.235,0,0,1,5.2,2.289A20.174,20.174,0,0,0,9615.6,12634Z" transform="translate(-9603.875 -12633.949)" opacity="0.49" fill="url(#linear-gradient-2)"/>
<path id="Path_4456" data-name="Path 4456" d="M9499,13345.158a12.86,12.86,0,0,0,8,7.852,23.4,23.4,0,0,1-3.057-10.4,7.245,7.245,0,0,1,.871-5.614A19.88,19.88,0,0,0,9499,13345.158Z" transform="translate(-9498.241 -13327.961)" opacity="0.49" fill="url(#linear-gradient-3)"/>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

2
addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/installer.twig
View File

@ -19,7 +19,7 @@
<div class="logo">
<a href="/admin" class="variant-logo">
{{ img('theme::img/icon.svg').data|raw }}
{{ img('theme::img/panel-icon.svg').data|raw }}
</a>
</div>

4
addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig
View File

@ -7,7 +7,7 @@
{% if setting_value('visiosoft.theme.defaultadmin::login_icon') %}
<img src="{{ file(setting_value('visiosoft.theme.defaultadmin::login_icon')).url }}" alt="site icon">
{% else %}
{{ img('theme::img/icon.svg').data|raw }}
{{ img('theme::img/login-icon.svg').data|raw }}
{% endif %}
{{ setting_value('visiosoft.theme.defaultadmin::title') }}
</div>
@ -21,7 +21,7 @@
{% if setting_value('visiosoft.theme.defaultadmin::login_icon') %}
<img src="{{ file(setting_value('visiosoft.theme.defaultadmin::login_icon')).url }}" alt="site icon">
{% else %}
{{ img('theme::img/icon.svg').data|raw }}
{{ img('theme::img/login-icon.svg').data|raw }}
{% endif %}
</div>

2
addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig
View File

@ -5,7 +5,7 @@
{% if setting_value('visiosoft.theme.defaultadmin::panel_icon') %}
<img src="{{ file(setting_value('visiosoft.theme.defaultadmin::panel_icon')).url }}" alt="site icon">
{% else %}
{{ img('theme::img/icon.svg').data|raw }}
{{ img('theme::img/panel-icon.svg').data|raw }}
{% endif %}
<span>{{ setting_value('visiosoft.theme.defaultadmin::title') }}</span>
</a>

2
addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
View File

@ -50,7 +50,7 @@
<div>
{% set userForm = form('userProfile').entry(user.id).get() %}
{{ userForm.open()|raw }}
<div class="mt-4 d-flex profile--desc flex-column flex-lg-row text-lg-center">
<div class="mt-4 d-flex profile--desc flex-column flex-lg-row">
<div class="d-flex d-sm-block m-auto m-sm-0 mr-sm-3">
<img src="{{ profile_photo }}">
</div>