From 655b1c3b271e05e37d9acae9d9ec49b38603fdc3 Mon Sep 17 00:00:00 2001
From: Vladimir <30542757+semchishinv@users.noreply.github.com>
Date: Fri, 23 Mar 2018 14:25:14 +0600
Subject: [PATCH] Fixed for ver 4.2 (#2)

* Fixed for ver 4.2

* Fixed according last comments
---
 admin/index.php                               |   4 +-
 docs/changelog.html                           |   5 +
 ...a.admin.wallpost.php => ia.admin.wall.php} |   4 +-
 ...a.front.wallpost.php => ia.front.wall.php} |   5 +-
 includes/hook.blocks-load.php                 |   8 +-
 index.php                                     |   5 +-
 install.xml                                   | 154 ++++++++--------
 js/admin/posts.js                             | 115 ++++++------
 js/frontend/block.wall.js                     | 166 +++++++++---------
 templates/admin/index.tpl                     | 114 ++++++------
 templates/front/block.wall.tpl                |  61 ++++---
 templates/front/css/style.css                 |  92 +++++-----
 templates/front/list.tpl                      |  64 +++----
 templates/front/tab.member.tpl                |  10 +-
 14 files changed, 407 insertions(+), 400 deletions(-)
 rename includes/classes/{ia.admin.wallpost.php => ia.admin.wall.php} (97%)
 rename includes/classes/{ia.front.wallpost.php => ia.front.wall.php} (95%)

diff --git a/admin/index.php b/admin/index.php
index b9271a2..286785f 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Subrion - open source content management system
- * Copyright (C) 2017 Intelliants, LLC <https://intelliants.com>
+ * Copyright (C) 2018 Intelliants, LLC <https://intelliants.com>
  *
  * This file is part of Subrion.
  *
@@ -24,7 +24,7 @@
  *
  ******************************************************************************/
 
-$iaWallpost = $iaCore->factoryPlugin('wall', iaCore::ADMIN, 'wallpost');
+$iaWallpost = $iaCore->factoryModule('wall', IA_CURRENT_MODULE);
 
 $iaDb->setTable('wall_posts');
 
diff --git a/docs/changelog.html b/docs/changelog.html
index f505216..7fb908a 100644
--- a/docs/changelog.html
+++ b/docs/changelog.html
@@ -1,4 +1,9 @@
 <ul>
+	<li>Version: 4.2.0
+		<ul>
+			<li>Updated for Subrion CMS 4.2</li>
+		</ul>
+	</li>
 	<li>Version: 4.1.0
 		<ul>
 			<li>Updated for Subrion CMS 4.1.x</li>
diff --git a/includes/classes/ia.admin.wallpost.php b/includes/classes/ia.admin.wall.php
similarity index 97%
rename from includes/classes/ia.admin.wallpost.php
rename to includes/classes/ia.admin.wall.php
index 0ac3cf8..5f4e98b 100644
--- a/includes/classes/ia.admin.wallpost.php
+++ b/includes/classes/ia.admin.wall.php
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Subrion - open source content management system
- * Copyright (C) 2017 Intelliants, LLC <https://intelliants.com>
+ * Copyright (C) 2018 Intelliants, LLC <https://intelliants.com>
  *
  * This file is part of Subrion.
  *
@@ -24,7 +24,7 @@
  *
  ******************************************************************************/
 
-class iaWallpost extends abstractModuleAdmin
+class iaWall extends abstractModuleAdmin
 {
     protected static $_table = 'wall_posts';
 
diff --git a/includes/classes/ia.front.wallpost.php b/includes/classes/ia.front.wall.php
similarity index 95%
rename from includes/classes/ia.front.wallpost.php
rename to includes/classes/ia.front.wall.php
index 7cbb6b1..72e9933 100644
--- a/includes/classes/ia.front.wallpost.php
+++ b/includes/classes/ia.front.wall.php
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Subrion - open source content management system
- * Copyright (C) 2017 Intelliants, LLC <https://intelliants.com>
+ * Copyright (C) 2018 Intelliants, LLC <https://intelliants.com>
  *
  * This file is part of Subrion.
  *
@@ -24,7 +24,7 @@
  *
  ******************************************************************************/
 
-class iaWallpost extends abstractModuleFront
+class iaWall extends abstractModuleFront
 {
     protected static $_table = 'wall_posts';
 
@@ -32,6 +32,7 @@ public function insert(array $data)
     {
         if (!$this->iaCore->get('wall_allow_wysiwyg')) {
             $data['body'] = htmlspecialchars($data['body']);
+            $data['ip'] = $this->iaCore->factory('util')->getIp();
         }
 
         $id = $this->iaDb->insert($data, array('date' => iaDb::FUNCTION_NOW), self::getTable());
diff --git a/includes/hook.blocks-load.php b/includes/hook.blocks-load.php
index c4e080c..a06160c 100644
--- a/includes/hook.blocks-load.php
+++ b/includes/hook.blocks-load.php
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Subrion - open source content management system
- * Copyright (C) 2017 Intelliants, LLC <https://intelliants.com>
+ * Copyright (C) 2018 Intelliants, LLC <https://intelliants.com>
  *
  * This file is part of Subrion.
  *
@@ -25,13 +25,15 @@
  ******************************************************************************/
 
 if (iaView::REQUEST_HTML == $iaView->getRequestType()) {
-    $iaWallpost = $iaCore->factoryPlugin('wall', iaCore::FRONT, 'wallpost');
+    $iaWallpost = $iaCore->factoryModule('wall', 'wall');
 
     if ($iaView->blockExists('wall')) {
+
         $array = $iaWallpost->getLatest($iaCore->get('posts_per_load'));
         $iaView->assign('latest_wall_posts', $array);
 
         $iaView->assign('num_total_wall_posts', $iaDb->foundRows());
+
     }
 
     if ('view_member' == $iaView->name()) {
@@ -40,5 +42,7 @@
         $iaView->assign('latest_wall_posts', $array);
 
         $iaView->assign('num_total_wall_posts', $iaDb->foundRows());
+
     }
+    $iaView->add_css('_IA_URL_modules/wall/templates/front/css/style');
 }
\ No newline at end of file
diff --git a/index.php b/index.php
index a2076d6..878c749 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Subrion - open source content management system
- * Copyright (C) 2017 Intelliants, LLC <https://intelliants.com>
+ * Copyright (C) 2018 Intelliants, LLC <https://intelliants.com>
  *
  * This file is part of Subrion.
  *
@@ -24,7 +24,8 @@
  *
  ******************************************************************************/
 
-$iaWallpost = $iaCore->factoryPlugin('wall', iaCore::FRONT, 'wallpost');
+$iaWallpost = $iaCore->factoryModule('wall', IA_CURRENT_MODULE);
+
 
 if (iaView::REQUEST_JSON == $iaView->getRequestType()) {
     $error = false;
diff --git a/install.xml b/install.xml
index a2f933f..b92c9c7 100644
--- a/install.xml
+++ b/install.xml
@@ -1,99 +1,99 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<plugin name="wall">
-	<title>Wall</title>
-	<summary>This plugin allows visitors to leave their messages/announcements at the Front End</summary>
-	<author>Intelliants LLC</author>
-	<contributor>Intelliants LLC</contributor>
-	<version>4.1.0</version>
-	<date>2018-01-17</date>
-	<compatibility>4.1</compatibility>
+<module type="plugin" name="wall">
+    <title>Wall</title>
+    <summary>This plugin allows visitors to leave their messages/announcements at the Front End</summary>
+    <author>Intelliants LLC</author>
+    <contributor>Intelliants LLC</contributor>
+    <version>4.2.0</version>
+    <date>2018-03-13</date>
+    <compatibility>4.2</compatibility>
 
-	<items>
-		<item payable="0" table_name="wall_posts">wall_posts</item>
-	</items>
+    <items>
+        <item payable="0" table_name="wall_posts">wall_posts</item>
+    </items>
 
-	<actions>
-		<action name="posts_view" url="wall-posts/" icon="list" order="1" pages="wall_posts">View</action>
-	</actions>
+    <actions>
+        <action name="posts_view" url="wall-posts/" icon="list" order="1" pages="wall_posts">View</action>
+    </actions>
 
-	<adminpages>
-		<page name="wall_posts" url="wall-posts/" menus="menu" order="40">Wall Posts</page>
-	</adminpages>
+    <adminpages>
+        <page name="wall_posts" url="wall-posts/" menus="menu" order="40">Wall Posts</page>
+    </adminpages>
 
-	<pages>
-		<page name="wall" url="wall/" service="1">Wall Posts</page>
-	</pages>
+    <pages>
+        <page name="wall" url="wall/" service="1">Wall Posts</page>
+    </pages>
 
-	<configgroup name="wall">Wall</configgroup>
+    <configgroup name="wall">Wall</configgroup>
 
-	<config group="wall" name="wall" type="divider" description="Wall Configuration">Wall Configuration</config>
-	<config group="wall" name="wall_allow_guests" type="radio" description="Allow guests to post" values="1,0">0</config>
-	<config group="wall" name="wall_allow_wysiwyg" type="radio" description="Allow WYSIWYG" values="1,0" value="1" private="0">0</config>
-	<config group="wall" name="wall_auto_approval" type="radio" description="Posts auto-approval" values="1,0">1</config>
-	<config group="wall" name="post_max_chars" type="text" description="Symbols limit">400</config>
-	<config group="wall" name="posts_per_load" type="text" description="Number of posts per load" private="0">5</config>
+    <config group="wall" name="wall" type="divider" description="Wall Configuration">Wall Configuration</config>
+    <config group="wall" name="wall_allow_guests" type="radio" description="Allow guests to post" values="1,0">0</config>
+    <config group="wall" name="wall_allow_wysiwyg" type="radio" description="Allow WYSIWYG" values="1,0" value="1" private="0">0</config>
+    <config group="wall" name="wall_auto_approval" type="radio" description="Posts auto-approval" values="1,0">1</config>
+    <config group="wall" name="post_max_chars" type="text" description="Symbols limit">400</config>
+    <config group="wall" name="posts_per_load" type="text" description="Number of posts per load" private="0">5</config>
 
-	<config group="email_templates" type="divider" name="wall_divider" description="Wall"><![CDATA[]]></config>
-	<config group="email_templates" type="radio" values="1,0" name="wall_admin_notification" description="New wall post alerts">1</config>
-	<config group="email_templates" type="text" name="wall_admin_notification_subject" description="Email Subject">New wall post added</config>
-	<config group="email_templates" type="textarea" name="wall_admin_notification_body" description="Email Body">
-		<![CDATA[
+    <config group="email_templates" type="divider" name="wall_divider" description="Wall"><![CDATA[]]></config>
+    <config group="email_templates" type="radio" values="1,0" name="wall_admin_notification" description="New wall post alerts">1</config>
+    <config group="email_templates" type="text" name="wall_admin_notification_subject" description="Email Subject">New wall post added</config>
+    <config group="email_templates" type="textarea" name="wall_admin_notification_body" description="Email Body">
+        <![CDATA[
 <p>Hi,</p>
 <p>New wall post has been published on your website "{%TITLE%}":</p>
 <p>{%TEXT%}</p>
 <p>For more details check the url: <a href="{%URL%}">{%URL%}</a></p>
-		]]>
-	</config>
+        ]]>
+    </config>
 
-	<phrases>
-		<phrase category="admin" key="add_post">Add Post</phrase>
+    <phrases>
+        <phrase category="admin" key="add_post">Add Post</phrase>
 
-		<phrase category="common" key="wall">Wall</phrase>
-		<phrase category="common" key="wall_posts">Wall Posts</phrase>
-		<phrase category="common" key="are_you_sure_to_delete_this_post">Are you sure you want to delete this post?</phrase>
-		<phrase category="common" key="are_you_sure_to_delete_selected_posts">Are you sure you want to delete selected comments?</phrase>
-		<phrase category="common" key="edit_post">Edit Post</phrase>
-		<phrase category="common" key="post_added">Post added.</phrase>
+        <phrase category="common" key="wall">Wall</phrase>
+        <phrase category="common" key="wall_posts">Wall Posts</phrase>
+        <phrase category="common" key="are_you_sure_to_delete_this_post">Are you sure you want to delete this post?</phrase>
+        <phrase category="common" key="are_you_sure_to_delete_selected_posts">Are you sure you want to delete selected comments?</phrase>
+        <phrase category="common" key="edit_post">Edit Post</phrase>
+        <phrase category="common" key="post_added">Post added.</phrase>
 
-		<phrase category="frontend" key="post_waits_for_approval">Your post will be displayed once approved by Administrator.</phrase>
-		<phrase category="frontend" key="guests_warning">Please login or register to post.</phrase>
-		<phrase category="frontend" key="error_max_chars">Your post's length should have less than :length symbols.</phrase>
-		<phrase category="frontend" key="error_empty_post">Your post is empty</phrase>
-		<phrase category="frontend" key="sumbit_post">Submit</phrase>
-		<phrase category="frontend" key="no_posts">No posts submitted yet.</phrase>
-	</phrases>
+        <phrase category="frontend" key="post_waits_for_approval">Your post will be displayed once approved by Administrator.</phrase>
+        <phrase category="frontend" key="guests_warning">Please login or register to post.</phrase>
+        <phrase category="frontend" key="error_max_chars">Your post's length should have less than :length symbols.</phrase>
+        <phrase category="frontend" key="error_empty_post">Your post is empty</phrase>
+        <phrase category="frontend" key="sumbit_post">Submit</phrase>
+        <phrase category="frontend" key="no_posts">No posts submitted yet.</phrase>
+    </phrases>
 
-	<blocks>
-		<block name="wall" title="Wall" position="bottom" type="smarty" sticky="0" pages="index" filename="block.wall" classname="box-clear"><![CDATA[]]></block>
-	</blocks>
+    <blocks>
+        <block name="wall" title="Wall" position="bottom" type="smarty" sticky="0" pages="index" filename="block.wall.tpl" classname="box-clear"><![CDATA[]]></block>
+    </blocks>
 
-	<hooks>
-		<hook name="phpCoreBeforePageDisplay" type="php" page_type="front" filename="hook.blocks-load"><![CDATA[]]></hook>
-		<hook name="smartyItemViewBeforeTabs" type="smarty" filename="tab.member"><![CDATA[]]></hook>
-		<hook name="adminDashboardStatistics" page_type="admin"><![CDATA[$items['wall:wallposts'] = 'plugin';]]></hook>
-	</hooks>
+    <hooks>
+        <hook name="phpCoreBeforePageDisplay" type="php" page_type="front" filename="hook.blocks-load.php"><![CDATA[]]></hook>
+        <hook name="smartyItemViewBeforeTabs" type="smarty" filename="tab.member.tpl"><![CDATA[]]></hook>
+        <hook name="adminDashboardStatistics" page_type="admin"><![CDATA[$items['wall:wallposts'] = 'plugin';]]></hook>
+    </hooks>
 
-	<install>
-		<sql>
-			<![CDATA[
+    <install>
+        <sql>
+            <![CDATA[
 CREATE TABLE `{prefix}wall_posts` (
-	`id` int(8) NOT NULL auto_increment,
-	`member_id` int(8) NOT NULL,
-	`body` text NOT NULL,
-	`ip` bigint(12) unsigned NOT NULL,
-	`date` datetime NOT NULL,
-	`status` enum('inactive', 'active') NOT NULL default 'inactive',
-	PRIMARY KEY  (`id`)
+    `id` int(8) NOT NULL auto_increment,
+    `member_id` int(8) NOT NULL,
+    `body` text NOT NULL,
+    `ip` bigint(12) unsigned NOT NULL,
+    `date` datetime NOT NULL,
+    `status` enum('inactive', 'active') NOT NULL default 'inactive',
+    PRIMARY KEY  (`id`)
 ) {mysql_version};
-			]]>
-		</sql>
-	</install>
+            ]]>
+        </sql>
+    </install>
 
-	<uninstall>
-		<sql>
-			<![CDATA[
+    <uninstall>
+        <sql>
+            <![CDATA[
 DROP TABLE IF EXISTS `{prefix}wall_posts`;
-			]]>
-		</sql>
-	</uninstall>
-</plugin>
\ No newline at end of file
+            ]]>
+        </sql>
+    </uninstall>
+</module>
\ No newline at end of file
diff --git a/js/admin/posts.js b/js/admin/posts.js
index 24732fa..fcb8c37 100644
--- a/js/admin/posts.js
+++ b/js/admin/posts.js
@@ -1,65 +1,62 @@
-Ext.onReady(function()
-{
-	var pageUrl = intelli.config.admin_url + '/wall-posts/';
+Ext.onReady(function () {
+    var pageUrl = intelli.config.admin_url + '/wall-posts/';
 
-	if (Ext.get('js-grid-placeholder'))
-	{
-		var urlParam = intelli.urlVal('status');
+    if (Ext.get('js-grid-placeholder')) {
+        var urlParam = intelli.urlVal('status');
 
-		intelli.comments =
-		{
-			columns: [
-				'selection',
-				{name: 'author', title: _t('author'), width: 140},
-				{name: 'body', title: _t('body'), width: 1, editor: 'text-wide'},
-				{name: 'ip', title: _t('ip_address'), width: 150, hidden: true},
-				{name: 'date', title: _t('date'), width: 180, editor: 'date'},
-				'status',
-				'delete'
-			],
-			storeParams: urlParam ? {status: urlParam} : null,
-			url: pageUrl
-		};
+        intelli.comments =
+            {
+                columns: [
+                    'selection',
+                    {name: 'author', title: _t('author'), width: 140},
+                    {name: 'body', title: _t('body'), width: 1, editor: 'text-wide'},
+                    {name: 'ip', title: _t('ip_address'), width: 150, hidden: true},
+                    {name: 'date', title: _t('date'), width: 180, editor: 'date'},
+                    'status',
+                    'delete'
+                ],
+                storeParams: urlParam ? {status: urlParam} : null,
+                url: pageUrl
+            };
 
-		intelli.comments = new IntelliGrid(intelli.comments, false);
-		intelli.comments.toolbar = Ext.create('Ext.Toolbar', {items:
-		[
-			{
-				emptyText: _t('text'),
-				name: 'text',
-				listeners: intelli.gridHelper.listener.specialKey,
-				xtype: 'textfield'
-			}, {
-				displayField: 'title',
-				editable: false,
-				emptyText: _t('status'),
-				id: 'fltStatus',
-				name: 'status',
-				store: intelli.comments.stores.statuses,
-				typeAhead: true,
-				valueField: 'value',
-				xtype: 'combo'
-			}, {
-				handler: function()
-				{
-					intelli.gridHelper.search(intelli.comments);
-				},
-				id: 'fltBtn',
-				text: '<i class="i-search"></i> ' + _t('search')
-			}, {
-				handler: function()
-				{
-					intelli.gridHelper.search(intelli.comments, true);
-				},
-				text: '<i class="i-close"></i> ' + _t('reset')
-			}
-		]});
+        intelli.comments = new IntelliGrid(intelli.comments, false);
+        intelli.comments.toolbar = Ext.create('Ext.Toolbar', {
+            items:
+                [
+                    {
+                        emptyText: _t('text'),
+                        name: 'text',
+                        listeners: intelli.gridHelper.listener.specialKey,
+                        xtype: 'textfield'
+                    }, {
+                    displayField: 'title',
+                    editable: false,
+                    emptyText: _t('status'),
+                    id: 'fltStatus',
+                    name: 'status',
+                    store: intelli.comments.stores.statuses,
+                    typeAhead: true,
+                    valueField: 'value',
+                    xtype: 'combo'
+                }, {
+                    handler: function () {
+                        intelli.gridHelper.search(intelli.comments);
+                    },
+                    id: 'fltBtn',
+                    text: '<i class="i-search"></i> ' + _t('search')
+                }, {
+                    handler: function () {
+                        intelli.gridHelper.search(intelli.comments, true);
+                    },
+                    text: '<i class="i-close"></i> ' + _t('reset')
+                }
+                ]
+        });
 
-		if (urlParam)
-		{
-			Ext.getCmp('fltStatus').setValue(urlParam);
-		}
+        if (urlParam) {
+            Ext.getCmp('fltStatus').setValue(urlParam);
+        }
 
-		intelli.comments.init();
-	}
+        intelli.comments.init();
+    }
 });
\ No newline at end of file
diff --git a/js/frontend/block.wall.js b/js/frontend/block.wall.js
index 0f57ff8..b704220 100644
--- a/js/frontend/block.wall.js
+++ b/js/frontend/block.wall.js
@@ -1,101 +1,101 @@
-$(function()
-{
-	var vUrl = intelli.config.ia_url + 'wall.json';
+$(function () {
+    var vUrl = intelli.config.url + 'wall.json';
 
-	$('.js-wall-post-submit').click(function(e) {
-		e.preventDefault();
+    $('.js-wall-post-submit').click(function (e) {
+        e.preventDefault();
 
-		if (1 == intelli.config.wall_allow_wysiwyg) {
-			$('textarea[name="body"]').val(CKEDITOR.instances['body'].getData());
-		}
+        if (1 == intelli.config.wall_allow_wysiwyg) {
+            $('textarea[name="body"]').val(CKEDITOR.instances['body'].getData());
+        }
 
-		var params = {
-			url: vUrl,
-			type: 'post',
-			data: $(this).closest('.js-wall-post-form').serialize()
-		};
-		
-		$.ajax(params).done(function(response) {
-			$('.js-wall-post-body').val('').trigger('keyup');
-			intelli.notifFloatBox({msg: response.messages, autohide: true, type: response.error ? 'error' : 'success'});
-			if (typeof response.html != 'undefined' && !response.error)
-			{
-				$('.js-wall-post-list .alert').remove();
+        var params = {
+            url: vUrl,
+            type: 'post',
+            data: $(this).closest('.js-wall-post-form').serialize()
+        };
+
+        $.ajax(params).done(function (response) {
+            $('.js-wall-post-body').val('').trigger('keyup');
+            intelli.notifFloatBox({msg: response.messages, autohide: true, type: response.error ? 'error' : 'success'});
+            if (typeof response.html != 'undefined' && !response.error) {
+                $('.js-wall-post-list .alert').remove();
                 $('<div style="display:none;margin-bottom:30px;">' + response.html + '</div>').prependTo('.js-wall-post-list').fadeIn(800);
                 if (1 == intelli.config.wall_allow_wysiwyg) {
                     CKEDITOR.instances['body'].setData('');
                 }
             }
-		});
-	});
-	
-	$('.js-wall-post-list').on('click', '.js-wall-post-delete', function(e) {
-		e.preventDefault();
-		var that = this;
+        });
+    });
+
+    $('.js-wall-post-list').on('click', '.js-wall-post-delete', function (e) {
+        e.preventDefault();
+        var that = this;
 
-		if (confirm(_t('are_you_sure_to_delete_this_post')))
-		{
-            intelli.post(vUrl, {action: 'delete', id: $(this).data('post-id')}).success(function(response) {
-				intelli.notifFloatBox({msg: response.messages, autohide: true, type: response.error ? 'error' : 'success'});
-				if (!response.error)
-				{
-					$(that).closest('.js-wall-post').fadeOut(800);
-				}
-			});
-		}
-	});
+        if (confirm(_t('are_you_sure_to_delete_this_post'))) {
+            intelli.post(vUrl, {action: 'delete', id: $(this).data('post-id')}).success(function (response) {
+                intelli.notifFloatBox({
+                    msg: response.messages,
+                    autohide: true,
+                    type: response.error ? 'error' : 'success'
+                });
+                if (!response.error) {
+                    $(that).closest('.js-wall-post').fadeOut(800);
+                }
+            });
+        }
+    });
 
-	$('.js-wall-post-list').on('click', '.js-wall-post-edit', function(e) {
-		e.preventDefault();
+    $('.js-wall-post-list').on('click', '.js-wall-post-edit', function (e) {
+        e.preventDefault();
 
-		var body_section = $(this).parent().parent().children('.js-wall-post-body-text');
-		var prev_body = body_section.text();
+        var body_section = $(this).parent().parent().children('.js-wall-post-body-text');
+        var prev_body = body_section.text();
 
-		body_section.html('');
-		body_section.append('<textarea rows="5" class="input-block-level js-wall-post-body-edit" style="resize: none;">' + prev_body + '</textarea>').append('<a href="#" class="btn btn-mini btn-success pull-left js-wall-post-update" data-post-id=' + $(this).data('post-id') + '><i class="icon-ok"></i> ' + _t('save') + '</a>');
+        body_section.html('');
+        body_section.append('<textarea rows="5" class="input-block-level js-wall-post-body-edit" style="resize: none;">' + prev_body + '</textarea>').append('<a href="#" class="btn btn-mini btn-success pull-left js-wall-post-update" data-post-id=' + $(this).data('post-id') + '><i class="icon-ok"></i> ' + _t('save') + '</a>');
 
-		body_section.children('.js-wall-post-update').click(function(e) {
-			e.preventDefault();
+        body_section.children('.js-wall-post-update').click(function (e) {
+            e.preventDefault();
 
-			var new_body = body_section.children('.js-wall-post-body-edit').val();
-			var post_id = $(this).data('post-id');
+            var new_body = body_section.children('.js-wall-post-body-edit').val();
+            var post_id = $(this).data('post-id');
 
-			intelli.post(vUrl, {action: 'edit', id: post_id, body: new_body}).success(function(response) {
-				intelli.notifFloatBox({msg: response.messages, autohide: true, type: response.error ? 'error' : 'success'});
-				if (!response.error)
-				{
-					body_section.children('.js-wall-post-body-edit').remove();
-					body_section.html(response.html);
-				}
-			});
-		});
-	});
+            intelli.post(vUrl, {action: 'edit', id: post_id, body: new_body}).success(function (response) {
+                intelli.notifFloatBox({
+                    msg: response.messages,
+                    autohide: true,
+                    type: response.error ? 'error' : 'success'
+                });
+                if (!response.error) {
+                    body_section.children('.js-wall-post-body-edit').remove();
+                    body_section.html(response.html);
+                }
+            });
+        });
+    });
 
-	$('.js-btn-wall-more').click(function(e) {
-		e.preventDefault();
-		var params = {
-			url: vUrl,
-			type: 'get',
-			data: {
-				action: 'read',
-				start: parseInt($('.js-wall-post').length),
-				limit: intelli.config.posts_per_load
-			}
-		};
+    $('.js-btn-wall-more').click(function (e) {
+        e.preventDefault();
+        var params = {
+            url: vUrl,
+            type: 'get',
+            data: {
+                action: 'read',
+                start: parseInt($('.js-wall-post').length),
+                limit: intelli.config.posts_per_load
+            }
+        };
 
-		$.ajax(params).done(function(response) {
-			if (typeof response.html != 'undefined' && 0 != response.html.length && !response.error)
-			{
-				$('<div style="display:none;margin-bottom:30px;">' + response.html + '</div>').insertBefore('.js-btn-wall-more').fadeIn(800);
-				if (parseInt($('.js-wall-post').length) >= response.total)
-				{
-					$('.js-btn-wall-more').hide();
-				}
-			}
-			else
-			{
-				$('.js-btn-wall-more').hide();
-			}
-		});
-	});
+        $.ajax(params).done(function (response) {
+            if (typeof response.html != 'undefined' && 0 != response.html.length && !response.error) {
+                $('<div style="display:none;margin-bottom:30px;">' + response.html + '</div>').insertBefore('.js-btn-wall-more').fadeIn(800);
+                if (parseInt($('.js-wall-post').length) >= response.total) {
+                    $('.js-btn-wall-more').hide();
+                }
+            }
+            else {
+                $('.js-btn-wall-more').hide();
+            }
+        });
+    });
 });
\ No newline at end of file
diff --git a/templates/admin/index.tpl b/templates/admin/index.tpl
index 650c28e..a80c780 100644
--- a/templates/admin/index.tpl
+++ b/templates/admin/index.tpl
@@ -1,67 +1,67 @@
 {if iaCore::ACTION_EDIT == $pageAction}
-	<form method="post" enctype="multipart/form-data" class="sap-form form-horizontal">
-		{preventCsrf}
+    <form method="post" enctype="multipart/form-data" class="sap-form form-horizontal">
+        {preventCsrf}
 
-		<div class="wrap-list">
-			<div class="wrap-group">
-				<div class="wrap-group-heading">
-					<h4>{lang key='options'}</h4>
-				</div>
-				
-				<div class="row">
-					<label class="col col-lg-2 control-label" for="input-item">{lang key="item"}</label>
-					<div class="col col-lg-4">
-						<input type="text" value="{$comment.item} [id: {$comment.item_id}]" id="input-item" disabled="disabled">
-					</div>
-				</div>
+        <div class="wrap-list">
+            <div class="wrap-group">
+                <div class="wrap-group-heading">
+                    <h4>{lang key='options'}</h4>
+                </div>
 
-				<div class="row">
-					<label class="col col-lg-2 control-label" for="input-author">{lang key="author"}</label>
-					<div class="col col-lg-4">
-						<input type="text" name="author" value="{$comment.author}" id="input-author">
-					</div>
-				</div>
+                <div class="row">
+                    <label class="col col-lg-2 control-label" for="input-item">{lang key="item"}</label>
+                    <div class="col col-lg-4">
+                        <input type="text" value="{$comment.item} [id: {$comment.item_id}]" id="input-item" disabled="disabled">
+                    </div>
+                </div>
 
-				<div class="row">
-					<label class="col col-lg-2 control-label" for="input-email">{lang key="email"}</label>
-					<div class="col col-lg-4">
-						<input type="text" name="email" id="input-email" value="{$comment.email}">
-					</div>
-				</div>
+                <div class="row">
+                    <label class="col col-lg-2 control-label" for="input-author">{lang key="author"}</label>
+                    <div class="col col-lg-4">
+                        <input type="text" name="author" value="{$comment.author}" id="input-author">
+                    </div>
+                </div>
 
-				<div class="row">
-					<label class="col col-lg-2 control-label" for="input-url">{lang key="url"}</label>
-					<div class="col col-lg-4">
-						<input type="text" name="url" id="input-url" value="{$comment.url}">
-					</div>
-				</div>
+                <div class="row">
+                    <label class="col col-lg-2 control-label" for="input-email">{lang key="email"}</label>
+                    <div class="col col-lg-4">
+                        <input type="text" name="email" id="input-email" value="{$comment.email}">
+                    </div>
+                </div>
 
+                <div class="row">
+                    <label class="col col-lg-2 control-label" for="input-url">{lang key="url"}</label>
+                    <div class="col col-lg-4">
+                        <input type="text" name="url" id="input-url" value="{$comment.url}">
+                    </div>
+                </div>
 
-				<div class="row">
-					<label class="col col-lg-2 control-label" for="body">{lang key='body'}</label>
-					<div class="col col-lg-8">
-						{if !$core.config.comments_allow_wysiwyg}
-							<textarea name="body" rows="6" cols="40" id="comment_form">{$comment.body}</textarea>
-						{else}
-							{ia_wysiwyg name="body" id="comment_form" value=$comment.body}
-						{/if}
-					</div>
-				</div>
 
-				<div class="row">
-					<label class="col col-lg-2 control-label" for="input-status">{lang key='status'}</label>
-					<div class="col col-lg-4">
-						<select name="status" id="input-status">
-							<option value="active"{if iaCore::STATUS_ACTIVE == $comment.status} selected="selected"{/if}>{lang key='active'}</option>
-							<option value="inactive"{if iaCore::STATUS_INACTIVE == $comment.status} selected="selected"{/if}>{lang key='inactive'}</option>
-						</select>
-					</div>
-				</div>
-			</div>
+                <div class="row">
+                    <label class="col col-lg-2 control-label" for="body">{lang key='body'}</label>
+                    <div class="col col-lg-8">
+                        {if !$core.config.comments_allow_wysiwyg}
+                            <textarea name="body" rows="6" cols="40" id="comment_form">{$comment.body}</textarea>
+                        {else}
+                            {ia_wysiwyg name="body" id="comment_form" value=$comment.body}
+                        {/if}
+                    </div>
+                </div>
 
-			<div class="form-actions inline">
-				<button type="submit" name="save" class="btn btn-primary">{lang key='save_changes'}</button>
-			</div>
-		</div>
-	</form>
+                <div class="row">
+                    <label class="col col-lg-2 control-label" for="input-status">{lang key='status'}</label>
+                    <div class="col col-lg-4">
+                        <select name="status" id="input-status">
+                            <option value="active"{if iaCore::STATUS_ACTIVE == $comment.status} selected="selected"{/if}>{lang key='active'}</option>
+                            <option value="inactive"{if iaCore::STATUS_INACTIVE == $comment.status} selected="selected"{/if}>{lang key='inactive'}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-actions inline">
+                <button type="submit" name="save" class="btn btn-primary">{lang key='save_changes'}</button>
+            </div>
+        </div>
+    </form>
 {/if}
\ No newline at end of file
diff --git a/templates/front/block.wall.tpl b/templates/front/block.wall.tpl
index 98f90d4..8da202f 100644
--- a/templates/front/block.wall.tpl
+++ b/templates/front/block.wall.tpl
@@ -1,45 +1,44 @@
 {if !(isset($isView) && $isView)}
-	{if (!$core.config.wall_allow_guests && !empty($member)) || $core.config.wall_allow_guests}
-		<form action="" class="ia-form clearfix js-wall-post-form">
+    {if (!$core.config.wall_allow_guests && !empty($member)) || $core.config.wall_allow_guests}
+        <form action="" class="ia-form clearfix js-wall-post-form">
             {preventCsrf}
-			<input type="hidden" name="action" value="add">
-			{if $core.config.wall_allow_wysiwyg}
-				{ia_wysiwyg value="" name="body"}
-			{else}
-				<textarea name="body" id="" rows="5" class="input-block-level js-wall-post-body" style="resize: none; width: 100%">{if isset($body)}{$body}{/if}</textarea>
-			{/if}
-			<div class="js-wall-post-counter"></div>
-			<button class="btn btn-small btn-primary pull-right js-wall-post-submit"><i class="icon-ok-circle"></i> {lang key='sumbit_post'}</button>
-		</form>
-	{else}
-		<div class="alert alert-info">{lang key='guests_warning'}</div>
-	{/if}
+            <input type="hidden" name="action" value="add">
+            {if $core.config.wall_allow_wysiwyg}
+                {ia_wysiwyg value="" name="body"}
+            {else}
+                <textarea name="body" id="" rows="5" class="input-block-level js-wall-post-body" style="resize: none; width: 100%">{if isset($body)}{$body}{/if}</textarea>
+            {/if}
+            <div class="js-wall-post-counter"></div>
+            <button class="btn btn-small btn-primary pull-right js-wall-post-submit"><i class="icon-ok-circle"></i> {lang key='sumbit_post'}</button>
+        </form>
+    {else}
+        <div class="alert alert-info">{lang key='guests_warning'}</div>
+    {/if}
 {/if}
 
 <div class="wall-posts clearfix js-wall-post-list">
-	{if isset($latest_wall_posts) && !empty($latest_wall_posts)}
-		{foreach $latest_wall_posts as $post}
-			{include file="{$smarty.const.IA_MODULES}wall/templates/front/list.tpl"}
-		{/foreach}
-		{if $num_total_wall_posts > $core.config.posts_per_load}
-			<a href="#" class="btn btn-small btn-block js-btn-wall-more"><i class="icon-download"></i> {lang key='more'}</a>
-		{/if}
-	{else}
-		<div class="alert alert-info">{lang key='no_posts'}</div>
-	{/if}
+    {if isset($latest_wall_posts) && !empty($latest_wall_posts)}
+        {foreach $latest_wall_posts as $post}
+            {include 'module:wall/list.tpl'}
+        {/foreach}
+        {if $num_total_wall_posts > $core.config.posts_per_load}
+            <a href="#" class="btn btn-small btn-block js-btn-wall-more"><i class="icon-download"></i> {lang key='more'}</a>
+        {/if}
+    {else}
+        <div class="alert alert-info">{lang key='no_posts'}</div>
+    {/if}
 </div>
 
 {ia_add_js}
 $(function()
 {
-	$('.js-wall-post-body').dodosTextCounter({$core.config.post_max_chars},
-	{
-		counterDisplayElement: 'span',
-		counterDisplayClass: 'js-wall-post-counter'
-	});
-	$('.js-wall-post-counter').addClass('textcounter').addClass('muted').wrap('<p class="help-block text-right js-wall-post-counter-wrapper"></p>');
+    $('.js-wall-post-body').dodosTextCounter({$core.config.post_max_chars},
+    {
+        counterDisplayElement: 'span',
+        counterDisplayClass: 'js-wall-post-counter'
+    });
+    $('.js-wall-post-counter').addClass('textcounter').addClass('muted').wrap('<p class="help-block text-right js-wall-post-counter-wrapper"></p>');
 });
 {/ia_add_js}
 
 {ia_print_js files='_IA_URL_modules/wall/js/frontend/block.wall,jquery/plugins/jquery.textcounter'}
-{ia_print_css files='_IA_URL_modules/wall/templates/front/css/style'}
\ No newline at end of file
diff --git a/templates/front/css/style.css b/templates/front/css/style.css
index 1829850..c0f6654 100644
--- a/templates/front/css/style.css
+++ b/templates/front/css/style.css
@@ -1,33 +1,33 @@
 .js-btn-wall-more {
-	border-color: transparent;
-	border-radius: 0;
+    border-color: transparent;
+    border-radius: 0;
 }
 
 .js-wall-post-counter-wrapper {
-	margin-bottom: 0px;
+    margin-bottom: 20px;
 }
 
 .js-wall-post-counter {
-	margin-right: 10px;
-	line-height: 28px;
+    margin-right: 10px;
+    line-height: 28px;
 }
 
 .wall-posts { }
 
 .wall-post {
-	border: 0 none;
-	padding: 0;
+    border: 0 none;
+    padding: 0;
 }
 
 .wall-post .media-body {
-	float: right;
-	width: 73%;
-	margin: 0;
-	overflow: visible;
+    float: right;
+    width: 73%;
+    margin: 0;
+    overflow: visible;
 }
 
 .wall-post .media-body .description {
-	padding: 10px;
+    padding: 10px;
     background: #f5f5f5;
     position: relative;
     font-size: 13px;
@@ -35,60 +35,60 @@
 }
 
 .wall-post .media-body .wall-post-actions {
-	font-size: 12px;
-	text-align: right;
-	margin: 5px 0 0;
+    font-size: 12px;
+    text-align: right;
+    margin: 5px 0 0;
 }
 
 .wall-post .media-body .wall-post-actions a {
-	color: #aaa;
-	text-decoration: none;
-	display: inline-block;
-	margin-left: 14px;
+    color: #aaa;
+    text-decoration: none;
+    display: inline-block;
+    margin-left: 14px;
 }
 
 .wall-post .media-body .wall-post-actions a:hover {
-	color: #555;
-	text-decoration: none;
+    color: #555;
+    text-decoration: none;
 }
 
 .wall-post .media-body .description:after {
-	position: absolute;
-	content: '';
-	left: -10px;
-	top: 20px;
-	width: 0px;
-	height: 0px;
-	border-style: solid;
-	border-width: 10px 10px 10px 0;
-	border-color: transparent #f5f5f5 transparent transparent;
+    position: absolute;
+    content: '';
+    left: -10px;
+    top: 20px;
+    width: 0px;
+    height: 0px;
+    border-style: solid;
+    border-width: 10px 10px 10px 0;
+    border-color: transparent #f5f5f5 transparent transparent;
 }
 
 .wall-post .ia-item-panel {
-	float: left;
-	clear: none;
-	background: none;
-	width: 23%;
-	padding: 0 10px 0 0;
-	margin: 0;
-	border: 0 none;
-	text-align: right;
+    float: left;
+    clear: none;
+    background: none;
+    width: 23%;
+    padding: 0 10px 0 0;
+    margin: 0;
+    border: 0 none;
+    text-align: right;
 }
 
 .wall-post .ia-item-panel .pull-left,
 .wall-post .ia-item-panel .pull-right {
-	float: none !important;
-	margin: 0;
-	padding: 0;
+    float: none !important;
+    margin: 0;
+    padding: 0;
 }
 
 .wall-post .ia-item-panel img {
-	border-radius: 50%;
-	background: #f5f5f5;
-	margin-bottom: 10px;
+    border-radius: 50%;
+    background: #f5f5f5;
+    margin-bottom: 10px;
 }
 
 .wall-post .name {
-	font-size: 14px;
-	margin: 0;
+    font-size: 14px;
+    margin: 0;
 }
\ No newline at end of file
diff --git a/templates/front/list.tpl b/templates/front/list.tpl
index 2d6af7c..040e21f 100644
--- a/templates/front/list.tpl
+++ b/templates/front/list.tpl
@@ -1,35 +1,35 @@
 <div class="media ia-item ia-item-bordered wall-post js-wall-post">
-	<div class="media-body">
-		<div class="description">
-			<div class="js-wall-post-body-text">{$post.body}</div>
-			{if !empty($member) && 0 != $post.member_id && $post.member_id == $member.id}
-				<p class="wall-post-actions">
-					<a href="#" class="js-wall-post-edit" data-post-id="{$post.id}"><i class="icon-edit"></i> {lang key='edit'}</a>&nbsp;
-					<a href="#" class="js-wall-post-delete" data-post-id="{$post.id}"><i class="icon-remove"></i> {lang key='delete'}</a>
-				</p>
-			{/if}
-		</div>	
-	</div>
-	<div class="ia-item-panel">
-		<div class="pull-right">
-			{if $post.author_avatar}
-				{assign var='author_avatar' value=$post.author_avatar|unserialize}
-				{if $author_avatar}
-					{printImage imgfile=$author_avatar.path width=60 height=60 title=$post.author}
-				{else}
-					<img src="{$smarty.const.IA_TPL_URL}img/no-avatar.png" alt="{$post.author}" width="60" height="60">
-				{/if}
-			{else}
-				<img src="{$smarty.const.IA_TPL_URL}img/no-avatar.png" alt="{$post.author}" width="60" height="60">
-			{/if}
-		</div>
+    <div class="media-body">
+        <div class="description">
+            <div class="js-wall-post-body-text">{$post.body}</div>
+            {if !empty($member) && 0 != $post.member_id && $post.member_id == $member.id}
+                <p class="wall-post-actions">
+                    <a href="#" class="js-wall-post-edit" data-post-id="{$post.id}"><i class="icon-edit"></i> {lang key='edit'}</a>&nbsp;
+                    <a href="#" class="js-wall-post-delete" data-post-id="{$post.id}"><i class="icon-remove"></i> {lang key='delete'}</a>
+                </p>
+            {/if}
+        </div>
+    </div>
+    <div class="ia-item-panel">
+        <div class="pull-right">
+            {if $post.author_avatar}
+                {assign var='author_avatar' value=$post.author_avatar|unserialize}
+                {if $author_avatar}
+                    {ia_image file=$author_avatar width=60 height=60 title=$post.author}
+                {else}
+                    <img src="{$smarty.const.IA_TPL_URL}img/no-avatar.png" alt="{$post.author}" width="60" height="60">
+                {/if}
+            {else}
+                <img src="{$smarty.const.IA_TPL_URL}img/no-avatar.png" alt="{$post.author}" width="60" height="60">
+            {/if}
+        </div>
 
-		<p class="name">
-			{if  0 == $post.member_id}
-				{lang key='guest'}
-			{else}
-				{ia_url type="link" data=$post item='members' text=$post.author}
-			{/if}</p>
-		{$post.date|date_format:$core.config.date_format}
-	</div>
+        <p class="name">
+            {if  0 == $post.member_id}
+                {lang key='guest'}
+            {else}
+                {ia_url type="link" data=$post item='member' text=$post.author}
+            {/if}</p>
+        {$post.date|date_format}
+    </div>
 </div>
\ No newline at end of file
diff --git a/templates/front/tab.member.tpl b/templates/front/tab.member.tpl
index f601e05..23ff772 100644
--- a/templates/front/tab.member.tpl
+++ b/templates/front/tab.member.tpl
@@ -1,7 +1,7 @@
 {if 'view_member' == $core.page.name}
-	{capture append='tabs_content' name='wall_posts'}
-		<div class="ia-wrap">
-			{include file="modules/wall/templates/front/block.wall.tpl" isView=true}
-		</div>
-	{/capture}
+    {capture append='tabs_content' name='wall_posts'}
+        <div class="ia-wrap">
+            {include 'module:wall/block.wall.tpl'}
+        </div>
+    {/capture}
 {/if}