KingOfDog.de/old
Archived
1
0
Fork 0
Code Releases Activity

Several small changes

Browse Source
This commit is contained in:
Marcel 2018-10-28 18:32:57 +01:00
parent e235682c91
commit c07b714a0d
11 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
application/language/de/general_lang.php
View File

@ -1,11 +1,12 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['website_name'] = 'KingOfDog.eu';
$lang['person_by'] = 'von';
$lang['additional_more'] = 'Mehr';
$lang['close'] = 'Schließen';
$lang['send'] = 'Absenden';
$lang['unknown'] = 'Unbekannt';
$lang['login'] = 'Anmelden';
$lang['edit'] = 'Bearbeiten';
$lang['website_name'] = 'KingOfDog.eu';
$lang['person_by'] = 'von';
$lang['additional_more'] = 'Mehr';
$lang['close'] = 'Schließen';
$lang['send'] = 'Absenden';
$lang['unknown'] = 'Unbekannt';
$lang['login'] = 'Anmelden';
$lang['edit'] = 'Bearbeiten';
$lang['date'] = 'd.m.Y \u\m H:i \U\h\r';

1
application/language/de/home_lang.php
View File

@ -30,7 +30,6 @@ $lang['home_error_twitter'] = 'Keine Tweets gefunden';
$lang['home_error_instagram'] = 'Keine Bilder gefunden';
$lang['home_error_youtube'] = 'Keine Videos gefunden';
$lang['home_social_all'] = 'Alle';
$lang['home_date'] = 'd.m.Y \u\m H:i \U\h\r';
$lang['home_posts'] = 'Letzte Posts';
$lang['home_ads_title'] = 'Wieso zeigen wir Werbung?';

19
application/language/en/general_lang.php
View File

@ -1,11 +1,12 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['website_name'] = 'KingOfDog.eu';
$lang['person_by'] = 'by';
$lang['additional_more'] = 'More';
$lang['close'] = 'Close';
$lang['send'] = 'Send';
$lang['unknown'] = 'Unknown';
$lang['login'] = 'Log in';
$lang['edit'] = 'Edit';
$lang['website_name'] = 'KingOfDog.eu';
$lang['person_by'] = 'by';
$lang['additional_more'] = 'More';
$lang['close'] = 'Close';
$lang['send'] = 'Send';
$lang['unknown'] = 'Unknown';
$lang['login'] = 'Log in';
$lang['edit'] = 'Edit';
$lang['date'] = 'Y-m-d \a\t g:i a';

1
application/language/en/home_lang.php
View File

@ -30,7 +30,6 @@ $lang['home_error_twitter'] = 'No tweets were found in the database currently. M
$lang['home_error_instagram'] = 'No images were found in the database currently. Maybe this is an error. Please try again later.';
$lang['home_error_youtube'] = 'No videos were found in the database currently. Maybe this is an error. Please try again later.';
$lang['home_social_all'] = 'All';
$lang['home_date'] = 'Y-m-d \a\t g:i a';
$lang['home_posts'] = 'Most Recent Posts';
$lang['home_ads_title'] = 'Why are we showing ads?';

6
application/views/emails/password_reset.php
View File

@ -280,7 +280,7 @@ a[x-apple-data-detectors=true] {
<!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding-right: 10px; padding-left: 10px; padding-top: 10px; padding-bottom: 10px;"><![endif]-->
<div style="color:#fff;line-height:200%;font-family:'Open Sans', Helvetica, Arial, sans-serif; padding-right: 10px; padding-left: 10px; padding-top: 10px; padding-bottom: 10px;">
<div style="font-size:12px;line-height:24px;text-align:center;color:#fff;font-family:'Open Sans', Helvetica, Arial, sans-serif;"><p style="margin: 0;font-size: 12px;line-height: 24px;text-align: center"><span style="font-size: 16px; line-height: 32px;">So wie es aussieht, hast du dein Passwort vergessen. Das kann vorkommen - überhaupt kein Problem! Durch einfaches Klicken auf den Button unten kannst du dein Passwort zurücksetzen und deinen Account auf KingOfDog.eu weiter benutzen wie immer.</span></p></div>
<div style="font-size:12px;line-height:24px;text-align:center;color:#fff;font-family:'Open Sans', Helvetica, Arial, sans-serif;"><p style="margin: 0;font-size: 12px;line-height: 24px;text-align: center"><span style="font-size: 16px; line-height: 32px;">Du hast diese E-Mail nicht angefordert? Kein Grund zur Panik! Solltest du Angst um die Sicherheit deines Accounts haben, kannst du dich jederzeit an uns wenden. Schreibe entweder eine Mail an <a href="mailto:contact@kingofdog.eu">contact@kingofdog.eu</a> oder nutze das Kontakt-Formular auf <a href="<?= base_url() ?>">KingOfDog.eu</a>.</span></p></div>
<div style="font-size:12px;line-height:24px;text-align:center;color:#fff;font-family:'Open Sans', Helvetica, Arial, sans-serif;"><p style="margin: 0;font-size: 12px;line-height: 24px;text-align: center"><span style="font-size: 16px; line-height: 32px;">Du hast diese E-Mail nicht angefordert? Kein Grund zur Panik! Solltest du Angst um die Sicherheit deines Accounts haben, kannst du dich jederzeit an uns wenden. Schreibe entweder eine Mail an <a href="mailto:contact@kingofdog.eu" style="color: #fff;">contact@kingofdog.eu</a> oder nutze das Kontakt-Formular auf <a href="<?= base_url() ?>" style="color: #fff;">KingOfDog.eu</a>.</span></p></div>
</div>
<!--[if mso]></td></tr></table><![endif]-->
</div>
@ -290,7 +290,7 @@ a[x-apple-data-detectors=true] {
<div align="center" class="button-container center " style="padding-right: 10px; padding-left: 10px; padding-top:10px; padding-bottom:10px;">
<!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-spacing: 0; border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt;"><tr><td style="padding-right: 10px; padding-left: 10px; padding-top:10px; padding-bottom:10px;" align="center"><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="" style="height:31pt; v-text-anchor:middle; width:111pt;" arcsize="58%" strokecolor="#134C75" fillcolor="#134C75"><w:anchorlock/><v:textbox inset="0,0,0,0"><center style="color:#ffffff; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:16px;"><![endif]-->
<div style="color: #ffffff; background-color: #134C75; border-radius: 24px; -webkit-border-radius: 24px; -moz-border-radius: 24px; max-width: 148px; width: 88px;width: auto; border-top: 0px solid transparent; border-right: 0px solid transparent; border-bottom: 0px solid transparent; border-left: 0px solid transparent; padding-top: 5px; padding-right: 30px; padding-bottom: 5px; padding-left: 30px; font-family: 'Open Sans', Helvetica, Arial, sans-serif; text-align: center; mso-border-alt: none;">
<span style="font-family:'Open Sans', Helvetica, Arial, sans-serif;font-size:16px;line-height:32px;"><a href="<?= base_url('reset/' . urlencode($userHash) . '/' . $resetKey) ?>" style="font-size: 14px;">PASSWORT ZURÜCKSETZEN</a></span>
<span style="font-family:'Open Sans', Helvetica, Arial, sans-serif;font-size:16px;line-height:32px;"><a href="<?= base_url('reset/' . urlencode($userHash) . '/' . $resetKey) ?>" style="font-size: 14px; color: #fff;">PASSWORT ZURÜCKSETZEN</a></span>
</div>
<!--[if mso]></center></v:textbox></v:roundrect></td></tr></table><![endif]-->
</div>
@ -300,7 +300,7 @@ a[x-apple-data-detectors=true] {
<div class="">
<!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding-right: 10px; padding-left: 10px; padding-top: 10px; padding-bottom: 10px;"><![endif]-->
<div style="color:#fff;line-height:200%;font-family:'Open Sans', Helvetica, Arial, sans-serif; padding-right: 10px; padding-left: 10px; padding-top: 10px; padding-bottom: 10px;">
<div style="font-size:12px;line-height:24px;text-align:center;color:#fff;font-family:'Open Sans', Helvetica, Arial, sans-serif;"><p style="margin: 0;font-size: 12px;line-height: 24px;text-align: center">Sollte der Button nicht funktionieren, besuche folgenden Link:<br><a href="<?= base_url('reset/' . urlencode($userHash) . '/' . $resetKey) ?>"><?= base_url('reset/' . urlencode($userHash) . '/' . $resetKey) ?></a></p></div>
<div style="font-size:12px;line-height:24px;text-align:center;color:#fff;font-family:'Open Sans', Helvetica, Arial, sans-serif;"><p style="margin: 0;font-size: 12px;line-height: 24px;text-align: center">Sollte der Button nicht funktionieren, besuche folgenden Link:<br><a href="<?= base_url('reset/' . urlencode($userHash) . '/' . $resetKey) ?>" style="color: #fff;"><?= base_url('reset/' . urlencode($userHash) . '/' . $resetKey) ?></a></p></div>
</div>
<!--[if mso]></td></tr></table><![endif]-->
</div>

4
application/views/emails/register.php
View File

@ -289,7 +289,7 @@ a[x-apple-data-detectors=true] {
<div align="center" class="button-container center " style="padding-right: 10px; padding-left: 10px; padding-top:10px; padding-bottom:10px;">
<!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-spacing: 0; border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt;"><tr><td style="padding-right: 10px; padding-left: 10px; padding-top:10px; padding-bottom:10px;" align="center"><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="" style="height:31pt; v-text-anchor:middle; width:111pt;" arcsize="58%" strokecolor="#134C75" fillcolor="#134C75"><w:anchorlock/><v:textbox inset="0,0,0,0"><center style="color:#ffffff; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:16px;"><![endif]-->
<div style="color: #ffffff; background-color: #134C75; border-radius: 24px; -webkit-border-radius: 24px; -moz-border-radius: 24px; max-width: 148px; width: 88px;width: auto; border-top: 0px solid transparent; border-right: 0px solid transparent; border-bottom: 0px solid transparent; border-left: 0px solid transparent; padding-top: 5px; padding-right: 30px; padding-bottom: 5px; padding-left: 30px; font-family: 'Open Sans', Helvetica, Arial, sans-serif; text-align: center; mso-border-alt: none;">
<span style="font-family:'Open Sans', Helvetica, Arial, sans-serif;font-size:16px;line-height:32px;"><a href="<?= base_url('activate/' . $emailHash . '/' . $activationKey) ?>" style="font-size: 14px;">ACCOUNT AKTIVIEREN</a></span>
<span style="font-family:'Open Sans', Helvetica, Arial, sans-serif;font-size:16px;line-height:32px;"><a href="<?= base_url('activate/' . $emailHash . '/' . $activationKey) ?>" style="font-size: 14px; color: #fff;">ACCOUNT AKTIVIEREN</a></span>
</div>
<!--[if mso]></center></v:textbox></v:roundrect></td></tr></table><![endif]-->
</div>
@ -299,7 +299,7 @@ a[x-apple-data-detectors=true] {
<div class="">
<!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding-right: 10px; padding-left: 10px; padding-top: 10px; padding-bottom: 10px;"><![endif]-->
<div style="color:#fff;line-height:200%;font-family:'Open Sans', Helvetica, Arial, sans-serif; padding-right: 10px; padding-left: 10px; padding-top: 10px; padding-bottom: 10px;">
<div style="font-size:12px;line-height:24px;text-align:center;color:#fff;font-family:'Open Sans', Helvetica, Arial, sans-serif;"><p style="margin: 0;font-size: 12px;line-height: 24px;text-align: center">Sollte der Button nicht funktionieren, besuche folgenden Link:<br><a href="<?= base_url('activate/' . $emailHash . '/' . $activationKey) ?>"><?= base_url('activate/' . $emailHash . '/' . $activationKey) ?></a></p></div>
<div style="font-size:12px;line-height:24px;text-align:center;color:#fff;font-family:'Open Sans', Helvetica, Arial, sans-serif;"><p style="margin: 0;font-size: 12px;line-height: 24px;text-align: center">Sollte der Button nicht funktionieren, besuche folgenden Link:<br><a href="<?= base_url('activate/' . $emailHash . '/' . $activationKey) ?>" style="color: #fff;"><?= base_url('activate/' . $emailHash . '/' . $activationKey) ?></a></p></div>
</div>
<!--[if mso]></td></tr></table><![endif]-->
</div>

2
application/views/network/blog/blog_post_item.php
View File

@ -15,7 +15,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<small><?= lang('person_by') ?> <a
href="<?= base_url('user/' . $data['username']) ?>"
target="_blank"><?= $data['displayname'] ?></a>
/ <?= date("d.m.Y H:i \\U\\h\\r ", strtotime($post['postPublishDate'])) ?>
/ <?= date(lang('date'), strtotime($post['postPublishDate'])) ?>
</small>
</h3>
<p class="comment"><?= $post['postDesc'] ?></p>

3
assets/css/login.css
View File

@ -25,7 +25,8 @@ section#formHolder {
.brand.active {
width: 100%;
margin-left: 25%;
max-width: 100%;
flex: 0 0 100%;
}
.brand::before {

4
assets/css/profile_page.css
View File

@ -185,6 +185,10 @@
top: 13.125px;
}
#profile-content {
padding-bottom: 100px;
}
.profile-displayname {
font-size: 24px;
}

7
assets/js/lib/bootstrap-3.3.7.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

10
assets/js/lib/bootstrap-colorpicker.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long