diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css
index bbade687..b45dddbe 100644
--- a/bl-kernel/admin/themes/default/css/default.css
+++ b/bl-kernel/admin/themes/default/css/default.css
@@ -1,8 +1,17 @@
-/* ----------- UIKIT HACKs FOR BLUDIT ----------- */
-* {
+.uk-form * {
border-radius: 2px !important;
}
+.uk-tab a {
+ color: #2196f3 !important;
+}
+
+a {
+ color: #2196f3 !important;
+}
+
+/* UIKIT HACKs navbar
+---------------------------------------------------------------- */
.uk-navbar {
background: #323232 !important;
border: 0 !important;
@@ -85,28 +94,26 @@ li.bludit-logo {
padding-right: 60px !important;
}
+/* UIKIT HACKs buttons
+---------------------------------------------------------------- */
.uk-button {
- color: #ffffff;
- padding: 2px 22px;
+ padding: 2px 26px;
text-shadow: none;
- background: #888888;
- border-radius: 3px;
-}
-
-.uk-button:hover,
-.uk-button:focus {
- background-color: #777777;
- color: #ffffff;
+ color: #333 !important;
}
.uk-button-primary {
- background: #2672ec;
+ background: #2196f3 !important;
+ color: #fff !important;
}
.uk-button-primary:hover {
- background: #1F5FC4;
+ background: #2EA3FF;
+ color: #fafafa !important;
}
+/* UIKIT HACKs forms
+---------------------------------------------------------------- */
legend {
width: 70% !important;
margin-top: 40px !important;
@@ -226,23 +233,22 @@ table.statistics tr:last-child td {
/* ----------- ALERT ----------- */
#alert {
- bottom: 20px;
color: #ffffff;
display: none;
- padding: 24px;
+ padding: 10px;
position: fixed;
- right: 20px;
text-align: center;
- width: 350px;
+ top: 0;
+ width: 100%;
z-index: 100;
}
.alert-ok {
- background: rgba(48, 102, 187, 0.91);
+ background: #4374C1;
}
.alert-fail {
- background: rgba(187, 48, 48, 0.91);
+ background: #c14343;
}
/* ----------- FORM ----------- */
@@ -298,7 +304,8 @@ table.statistics tr:last-child td {
}
#jstagList span.select {
- color: #2672ec;
+ color: #2196f3;
+ padding: 2px 13px;
}
/* ----------- BLUDIT IMAGES V8 ----------- */
diff --git a/bl-kernel/admin/themes/default/index.php b/bl-kernel/admin/themes/default/index.php
index a223158f..a69682b0 100644
--- a/bl-kernel/admin/themes/default/index.php
+++ b/bl-kernel/admin/themes/default/index.php
@@ -83,8 +83,8 @@ $(document).ready(function() {
p('Settings') ?> ▾
- - p('General') ?>
- - p('Advanced') ?>
+ - p('General') ?>
+ - p('Advanced') ?>
- p('Language and timezone') ?>
- p('Plugins') ?>
diff --git a/bl-kernel/admin/views/manage-pages.php b/bl-kernel/admin/views/manage-pages.php
index 6e37335c..b75b7b67 100644
--- a/bl-kernel/admin/views/manage-pages.php
+++ b/bl-kernel/admin/views/manage-pages.php
@@ -26,11 +26,16 @@ echo '
$parentTitle = '';
}
+
+
echo '';
echo ''.($Page->parentKey()?'- ':'').''.($Page->published()?'':''.$Language->g('Draft').' ').($Page->title()?$Page->title():''.$Language->g('Empty title').' ').' | ';
echo ''.$parentTitle.' | ';
echo ''.$Page->position().' | ';
- echo ''.$Url->filters('page').'/'.$Page->key().' | ';
+
+ $friendlyURL = Text::isEmpty($Url->filters('page')) ? '/'.$Page->key() : '/'.$Url->filters('page').'/'.$Page->key();
+
+ echo ''.$friendlyURL.' | ';
echo '
';
}
}
diff --git a/bl-kernel/admin/views/manage-posts.php b/bl-kernel/admin/views/manage-posts.php
index 11b44f1a..55d1a647 100644
--- a/bl-kernel/admin/views/manage-posts.php
+++ b/bl-kernel/admin/views/manage-posts.php
@@ -27,7 +27,10 @@ echo '
echo '';
echo ''.($status?''.$status.'':'').($Post->title()?$Post->title():''.$Language->g('Empty title').' ').' | ';
echo ''.$Post->dateRaw().' | ';
- echo ''.$Url->filters('post').'/'.$Post->key().' | ';
+
+ $friendlyURL = Text::isEmpty($Url->filters('post')) ? '/'.$Post->key() : '/'.$Url->filters('post').'/'.$Post->key();
+
+ echo ''.$friendlyURL.' | ';
echo '
';
}
diff --git a/bl-kernel/admin/views/settings-general.php b/bl-kernel/admin/views/settings-general.php
index 06274a6d..4387719f 100644
--- a/bl-kernel/admin/views/settings-general.php
+++ b/bl-kernel/admin/views/settings-general.php
@@ -51,7 +51,6 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
'label'=>'Twitter',
'value'=>$Site->twitter(),
'class'=>'uk-width-1-2 uk-form-medium',
- 'placeholder'=>'https://twitter.com/USERNAME',
'tip'=>''
));
@@ -60,7 +59,6 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
'label'=>'Facebook',
'value'=>$Site->facebook(),
'class'=>'uk-width-1-2 uk-form-medium',
- 'placeholder'=>'https://www.facebook.com/USERNAME',
'tip'=>''
));
@@ -69,7 +67,6 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
'label'=>'Google+',
'value'=>$Site->googlePlus(),
'class'=>'uk-width-1-2 uk-form-medium',
- 'placeholder'=>'https://plus.google.com/+USERNAME',
'tip'=>''
));
@@ -78,7 +75,6 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
'label'=>'Instagram',
'value'=>$Site->instagram(),
'class'=>'uk-width-1-2 uk-form-medium',
- 'placeholder'=>'https://www.instagram.com/USERNAME',
'tip'=>''
));
@@ -87,7 +83,6 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
'label'=>'Github',
'value'=>$Site->github(),
'class'=>'uk-width-1-2 uk-form-medium',
- 'placeholder'=>'https://github.com/USERNAME',
'tip'=>''
));
diff --git a/bl-kernel/admin/views/settings-regional.php b/bl-kernel/admin/views/settings-regional.php
index 635493ec..e301df14 100644
--- a/bl-kernel/admin/views/settings-regional.php
+++ b/bl-kernel/admin/views/settings-regional.php
@@ -43,7 +43,8 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
'name'=>'dateFormat',
'label'=>$L->g('Date format'),
'value'=>$Site->dateFormat(),
- 'class'=>'uk-width-1-2 uk-form-medium'
+ 'class'=>'uk-width-1-2 uk-form-medium',
+ 'tip'=>$L->g('Current format').': '.Date::current($Site->dateFormat())
));
echo '
diff --git a/bl-languages/en_US.json b/bl-languages/en_US.json
index 29b75fa2..049d438d 100644
--- a/bl-languages/en_US.json
+++ b/bl-languages/en_US.json
@@ -237,5 +237,6 @@
"social-networks-links": "Social networks links",
- "email-access-code": "Email access code"
+ "email-access-code": "Email access code",
+ "current-format": "Current format"
}
\ No newline at end of file