diff --git a/lib/ajax.php b/lib/ajax.php index 68f4ba6d..97fdb591 100644 --- a/lib/ajax.php +++ b/lib/ajax.php @@ -25,6 +25,8 @@ require './userdata.inc.php'; require './tables.inc.php'; require './classes/database/class.Database.php'; require './classes/settings/class.Settings.php'; +require './functions/validate/function.validate_ip.php'; +require './functions/validate/function.validateDomain.php'; if(isset($_POST['action'])) { $action = $_POST['action']; @@ -72,7 +74,19 @@ if ($action == "newsfeed") { $content = preg_replace("/[\r\n]+/", " ", strip_tags($item->description)); $content = substr($content, 0, 150) . "..."; - echo "" . $date . "
" . $title . "
" . $content . "
"; + echo "
  • +
    +
    + {$title} + + {$date} + +
    +

    + {$content} +

    +
    +
  • "; } } else { echo ""; diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl index 37b1f75e..e541fe03 100644 --- a/templates/Sparkle/admin/index/index.tpl +++ b/templates/Sparkle/admin/index/index.tpl @@ -174,7 +174,12 @@ $header News - + + + + + + diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index 5ab796fe..e5d596f1 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -864,7 +864,7 @@ label.nobr { margin-bottom:5px; } -/* NEWSFEED */ +/* NEWSFEED #newsfeed { display: none; } @@ -899,6 +899,45 @@ label.nobr { .newsitem small { font-size:8px; color:gray; +}*/ +.newsfeed { + margin: 0; + padding: 0; + list-style: none; +} + +.newsfeed li { + margin-bottom: 10px; + padding-bottom: 5px; + border-bottom: 1px dotted #999; +} + +.newsfeed li:last-child { + margin-bottom: 0; + padding-bottom: 0; + border-bottom: none; +} + +.newsfeed li.left .newsfeed-body { + margin-left: 60px; +} + +.newsfeed li.right .newsfeed-body { + margin-right: 60px; +} + +.newsfeed li .newsfeed-body p { + margin: 0; +} + +.panel .slidedown .glyphicon, +.newsfeed .glyphicon { + margin-right: 5px; +} + +.newsfeed-panel .panel-body { + height: 350px; + overflow-y: scroll; } /* TIPPER */ diff --git a/templates/Sparkle/customer/index/index.tpl b/templates/Sparkle/customer/index/index.tpl index e6f80604..168c009e 100644 --- a/templates/Sparkle/customer/index/index.tpl +++ b/templates/Sparkle/customer/index/index.tpl @@ -156,7 +156,12 @@ $header News - + + + + + +