Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-14 09:44:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

* added news preview function (news, ticker, article)

Browse Source 
* update TODO
This commit is contained in:
slawkens1
2018-01-03 23:49:46 +01:00
parent 4a948b8ba2
commit 854560b2f5
7 changed files with 200 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
system/init.php
View File

@@ -37,7 +37,8 @@ Twig_Autoloader::register();
$twig_loader = new Twig_Loader_Filesystem(SYSTEM . 'templates');
$twig = new Twig_Environment($twig_loader, array(
'cache' => CACHE . 'twig/',
'auto_reload' => true
'auto_reload' => true,
//'debug' => true
));
$function = new Twig_SimpleFunction('getStyle', function ($i) {

2
system/pages/news.php
View File

@@ -387,7 +387,7 @@ class News
if(!self::verify($title, $body, $article_text, $article_image, $errors))
return false;
$db->insert(TABLE_PREFIX . 'news', array('title' => $title, 'body' => $body, 'type' => $type, 'date' => time(), 'category' => $category, 'player_id' => isset($player_id) ? $player_id : 0, 'comments' => $comments, 'article_text' => $article_text, 'article_image' => $article_image));
$db->insert(TABLE_PREFIX . 'news', array('title' => $title, 'body' => $body, 'type' => $type, 'date' => time(), 'category' => $category, 'player_id' => isset($player_id) ? $player_id : 0, 'comments' => $comments, 'article_text' => ($type == 3 ? $article_text : ''), 'article_image' => ($type == 3 ? $article_image : '')));
return true;
}

18
system/template.php
View File

@@ -33,20 +33,20 @@ if($config['template_allow_change'])
}
$template_path = 'templates/' . $template_name;
if(!file_exists($template_path . '/index.php') &&
!file_exists($template_path . '/template.php') &&
!file_exists($template_path . '/layout.php'))
if(!file_exists(BASE . $template_path . '/index.php') &&
!file_exists(BASE . $template_path . '/template.php') &&
!file_exists(BASE . $template_path . '/layout.php'))
{
$template_name = 'kathrine';
$template_path = TEMPLATES . $template_name;
$template_path = 'templates/' . $template_name;
}
$file = $template_path . '/config.ini';
$file = BASE . $template_path . '/config.ini';
$exists = file_exists($file);
if($exists || ($config['backward_support'] && file_exists($template_path . '/layout_config.ini')))
if($exists || ($config['backward_support'] && file_exists(BASE . $template_path . '/layout_config.ini')))
{
if(!$exists)
$file = $template_path . '/layout_config.ini';
$file = BASE . $template_path . '/layout_config.ini';
if($cache->enabled())
{
@@ -65,8 +65,8 @@ if($exists || ($config['backward_support'] && file_exists($template_path . '/lay
foreach($template_ini as $key => $value)
$config[$key] = $value;
}
else if(file_exists($template_path . '/config.php'))
require($template_path . '/config.php');
else if(file_exists(BASE . $template_path . '/config.php'))
require(BASE . $template_path . '/config.php');
$template = array();
$template['link_account_manage'] = getLink('account/manage');

68
system/templates/news.add.html.twig
View File

@@ -1,7 +1,8 @@
<div id="news_preview"></div>
{% if action != 'edit' %}
<a id="news-button" href="#">Add news</a>
{% endif %}
<form method="post" action="{{ news_link_form }}">
<form method="post" action="{{ news_link_form }}" id="news-edit-form">
{% if action == 'edit' %}
<input type="hidden" name="id" value="{{ news_id }}" />
{% endif %}
@@ -15,7 +16,7 @@
{% set rows = rows + 1 %}
<tr bgcolor="{{ getStyle(rows) }}">
<td><b>Title:</b></td>
<td><input name="title" value="{{ title }}" size="50" maxlength="100"/></td>
<td><input name="title" id="title" value="{{ title }}" size="50" maxlength="100"/></td>
</tr>
{% set rows = rows + 1 %}
@@ -40,7 +41,7 @@
<tr id="article-text" bgcolor="{{ getStyle(rows) }}"{% if article_text is empty %} style="display: none;"{% endif %}>
<td><b>Article short text:<br/>This will be displayed on news page.<br/>Rest will be available on "read more" page.</b></td>
<td>
<textarea name="article_text">{% if article_text is not empty %}{{ article_text }}{% endif %}</textarea>
<textarea name="article_text" id="article_text">{% if article_text is not empty %}{{ article_text }}{% endif %}</textarea>
</td>
</tr>
@@ -48,7 +49,7 @@
<tr id="article-image" bgcolor="{{ getStyle(rows) }}"{% if article_image is empty %} style="display: none;"{% endif %}>
<td><b>Article image:</b></td>
<td>
<input type="text" name="article_image" value="{% if article_image is not empty %}{{ article_image }}{% else %}images/news/announcement.jpg{% endif %}" />
<input type="text" name="article_image" id="article_image" value="{% if article_image is not empty %}{{ article_image }}{% else %}images/news/announcement.jpg{% endif %}" />
</td>
</tr>
@@ -70,7 +71,7 @@
<tr bgcolor="{{ getStyle(rows) }}">
<td width="180"><b>{% if action == 'edit' %}Modified by{% else %}Author{% endif %}:</b></td>
<td>
<select name="player_id">
<select name="player_id" id="player_id">
{% for player in account_players %}
<option value="{{ player.getId() }}"{% if player_id is defined and player.getId() == player_id %} selected="selected"{% endif %}>{{ player.getName() }}</option>
{% endfor %}
@@ -93,7 +94,7 @@
<tr bgcolor="{{ getStyle(rows) }}">
<td><b>Create forum thread in section:</b></td>
<td>
<select name="forum_section">
<select name="forum_section" id="forum_section">
<option value="-1">None</option>
{% for section in forum_boards %}
<option value="{{ section.id }}" {% if forum_section is defined and forum_section == section.id %}checked="yes"{% endif %}/>{{ section.name }}</option>
@@ -102,12 +103,13 @@
</td>
</tr>
{% elseif comments is not null%}
<input type="hidden" name="forum_section" value="{{ comments }}" />
<input type="hidden" name="forum_section" id="forum_section" value="{{ comments }}" />
{% endif %}
{% set rows = rows + 1 %}
<tr bgcolor="{{ getStyle(rows) }}">
<td align="right">
<a id="preview" style="cursor: pointer;">Preview</a>
<input type="submit" value="Submit"/>
</td>
<td align="left">
@@ -170,6 +172,58 @@
unsaved = false;
window.location = '{{ news_link }}';
});
$("#news-edit-form").submit(function( event ) {
unsaved = false;
});
if($("#news.Box").length > 0) {
$('<div id="article_preview"></div>').insertBefore("#news.Box");
$('<div id="ticker_preview"></div>').insertBefore("#news.Box");
}
else {
$('<div id="article_preview"></div>').insertBefore("#news-edit");
$('<div id="ticker_preview"></div>').insertBefore("#news-edit");
}
$("#preview").click(function(e) {
var title = document.getElementById("title").value;
var body = tinyMCE.activeEditor.getContent();
var player_id = document.getElementById("player_id").value;
var category = $('input[name=category]:checked').val();
var forum_section = document.getElementById("forum_section").value;
var type = document.getElementById("select-type").value;
var params = { title: title, body: body, player_id: player_id, category: category, forum_section: forum_section, template_path: '{{ template_path }}', type: type, uid: Math.random() }
if(type == 3) {
params.article_text = document.getElementById("article_text").value;
params.article_image = document.getElementById("article_image").value;
}
$.getJSON("tools/news_preview.php", params, function(data){
if(data.hasOwnProperty('success')) {
if(type == 3) { // ARTICLE
$('#news_preview').html('');
$('#ticker_preview').html('');
$('#article_preview').html(data.success);
}
else if(type == 2) { // TICKER
$('#news_preview').html('');
$('#ticker_preview').html(data.success);
$('#article_preview').html('');
}
else { // NEWS
$('#news_preview').html(data.success);
$('#ticker_preview').html('');
$('#article_preview').html('');
}
}
else if(data.hasOwnProperty('error')) {
$('#news_preview').html(data.error);
}
});
});
lastContent = $("#body").val();
});