Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

templates/client/article/article.html

@@ -20,7 +20,10 @@
         {% include 'client/includes/article/article_logo.html' with obj=object %}
         <h1>{{ object.main_title }}</h1>
         <strong><span>{{ object.created|date:"d E Y" }}</span><a class="profile_link" href="{{ object.author.get_permanent_url }}" title="">{{ object.author.get_full_name }}</a></strong>
-        {{ object.description|safe }}
+		<p style="text-align: justify" align="justify">&nbsp;</p><hr>
+		<div class="content-text">
+        	{{ object.description|safe }}
+		</div>
 
         <div class="blog_avtor">
             <table>

templates/client/article/news.html

@@ -22,7 +22,9 @@
         <h1>{{ object.main_title }}</h1>
         <strong><span>{{ object.created|date:"d E Y" }}</span>{% if object.get_event %}<a class="flag" href="{{ object.get_event.get_permanent_url }}" title="">{{ object.get_event.name }}</a>{% endif %}</strong>
     </div>
-    {{ object.description|safe }}
+    <div class="content-text">
+        {{ object.description|safe }}
+    </div>
 
     <div class="blog_avtor">
         <div class="blog_avtormidle">

templates/client/static_client/css/main.css

@@ -11514,7 +11514,10 @@ hr + .rq-note {
 .blog_block_headline strong a.profile_link:before {content: ' ';display: inline-block;vertical-align: middle; width: 11px; height: 13px; background: url(../img/sprites.png) -24px 0 no-repeat;margin: 0 5px 0 0;}
 .blog_block_headline strong a.flag:before {content: ' ';display: inline-block;vertical-align: middle; width: 14px; height: 14px; background: url(../img/sprites.png) -329px -49px no-repeat;margin: 0 5px 0 0;}
 .blog_block_headline .pic { display: block; position: absolute; left: 0; top: 0; width: 100px; height: 100px; border-radius: 4px;}
-
+.blog_block_headline .content-text{
+	margin-left: -120px;
+	margin-top: 2em;
+}
 .blog_block .pic_left { float: left; margin: 4px 30px 5px 0;}
 .blog_block .pic_left img { display: block; border-radius: 4px;}
 .blog_block .pic_left i { font-size: 11px; color: #a1a1a1; display: block; padding: 3px 0 0 0;}
@@ -11523,7 +11526,7 @@ hr + .rq-note {
 .blog_block .pic_right img { display: block; border-radius: 4px;}
 .blog_block .pic_right i { font-size: 11px; color: #a1a1a1; display: block; padding: 3px 0 0 0;}
 
-.blog_avtor { border-top: 1px dotted #ccc; padding: 20px 0 0 0; margin: 19px 0 0 0;}
+.blog_avtor { /*border-top: 1px dotted #ccc;*/ padding: 20px 0 0 0; margin: 19px 0 0 0;}
 .blog_avtor table { float: left;}
 .blog_avtor table tr th { text-align: left; vertical-align: top; padding: 3px 20px 0 0; font-weight: normal; font-size: 13px; color: #a2a2a2;font-family: 'dindisplay_pro', sans-serif;}
 .blog_avtor table tr td { text-align: left; vertical-align: middle; padding: 0 9px 0 0;font-family: 'dindisplay_pro', sans-serif;}