Alex Aragón пре 6 година
родитељ
комит
887713d31e

+ 0 - 202
assets/css/base.css

@@ -347,208 +347,6 @@
     background: url("../../public/img/icons/22/arrow-down-collapse.png") no-repeat left center;
 }
 
-/* REPORTS */
-.panel-default.panel-view {
-    border: 1px solid #e4e4e4;
-    box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
-}
-
-.panel-view {
-    padding: 20px;
-    text-align: center;
-}
-
-
-
-
-
-
-.item-report .panel-default {
-    background-color: #ededed;
-    border: 1px solid #e4e4e4;
-    box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
-}
-
-.item-report .item-report-number {
-    font-size: 35px;
-    font-weight: bold;
-    color: #666666;
-}
-
-/*****************************************************
- *              AGENDA                               *
- *****************************************************/
-#agenda {
-    width: 100%;
-    margin: 0 auto;
-    border: 1px solid #bbb;
-    border-collapse: collapse;
-}
-
-.agenda_month_divider {
-    background-color: #dcdcdc;
-    font-weight: bold;
-    font-size: 12px;
-    color: #666;
-    text-align: center;
-}
-
-#agenda .title a {
-    color: #fff;
-}
-
-#agenda .agendaitem {
-    font-size: 12px;
-}
-
-#smallcalendar .title {
-    background-color: #dcdcdc;
-    font-weight: bold;
-    padding: 5px;
-    color: #666;
-    text-align: center;
-    font-size: 11px;
-}
-
-#smallcalendar .title a {
-    color: #666;
-}
-
-#agenda_select {
-    list-style: none;
-    border: 0 solid green;
-    margin: 30px 0 0 0;
-    padding: 0 0 0 10px;
-}
-
-#simple-dialog-form {
-    font-size: 12px;
-}
-
-#simple-dialog-form .control-label {
-    padding-top: 0;
-}
-
-.agenda_day {
-    float: left;
-    color: #666666;
-    line-height: 16px;
-    overflow: hidden;
-    margin-bottom: 5px;
-}
-
-.agenda-title {
-    font-size: 20px;
-}
-
-.days_today {
-    background-color: #E8E8E8;
-}
-
-.days_today .agenda_day {
-    float: left;
-    width: 100%;
-    color: #000;
-    line-height: 16px;
-    overflow: hidden;
-    margin-bottom: 5px;
-}
-
-#agenda_list th {
-    background-color: #F2F2F2;
-}
-
-#agenda_list .days_week {
-    height: 100px;
-}
-
-/* ---------------------------------------------------
-    styles for the mini agenda
------------------------------------------------------*/
-#smallcalendar {
-    width: 100%;
-    margin: 0 auto;
-    border: 1px solid #fff;
-    border-collapse: collapse;
-}
-
-#smallcalendar .weekdays {
-    background-color: #dcdcdc;
-    text-align: center;
-    font-size: 9px;
-    font-weight: bold;
-    border: 1px solid #fff;
-    border-collapse: collapse;
-}
-
-#smallcalendar .days_week {
-    background-color: #f5f5f5;
-    text-align: center;
-    font-size: 9px;
-    border-collapse: collapse;
-}
-
-#smallcalendar .days_weekend {
-    background-color: #e6e6e6;
-    text-align: center;
-    font-size: 9px;
-    border: 1px solid #fff;
-    border-collapse: collapse;
-}
-
-#smallcalendar .days_today {
-    width: 12%;
-    text-align: center;
-    font-size: 9px;
-    border: 1px solid #FA8500;
-    border-collapse: collapse;
-    background-color: #FFCA8D;
-}
-
-#smallcalendar tbody tr td {
-    padding: 5px;
-}
-
-/* ---------------------------------------------------
-    styles for the personal agenda
------------------------------------------------------*/
-.personal_agenda {
-    color: #008000;
-}
-
-.personal_agenda a:link, .personal_agenda a:visited {
-    color: #008000;
-}
-
-a.personal_agenda:link, a.personal_agenda:visited {
-    color: #008000;
-}
-
-.personal_agenda a:hover, .personal_agenda a:hover {
-    color: #666666;
-}
-
-a.personal_agenda:hover, a.personal_agenda:hover {
-    color: #666666;
-}
-
-.myagendatoday {
-    background-color: #FFCA8D;
-    border-collapse: collapse;
-    font-family: verdana, arial, helvetica, sans-serif;
-    color: #CC3300;
-    font-weight: bold;
-}
-
-.rounded_div_agenda {
-    background: none repeat scroll 0 0 #FFFFFF;
-    float: left;
-    height: auto;
-    margin: 2px 4px 5px;
-    padding: 8px;
-    width: 100%;
-}
-
 /* -------------- DOCUMENT --------------*/
 #document_quota {
     margin: 15px;

+ 5 - 0
assets/css/scss/_base.scss

@@ -1095,6 +1095,11 @@ footer {
 /*** REPORTS ***/
 .item-report {
   text-align: center;
+  .item-report-number {
+    font-size: 35px;
+    font-weight: bold;
+    color: #666666;
+  }
 }
 .card-box{
   .icon-big{

+ 2 - 2
main/blog/blog.php

@@ -422,11 +422,11 @@ switch ($action) {
             $titleSearch = get_lang('PostsOf').' '.$dateSearch;
             $tpl->assign('search', $titleSearch);
             $tpl->assign('articles', $listArticles);
-            $blogLayout = $tpl->get_template('blog/blog.tpl');
+            $blogLayout = $tpl->get_template('blog/blog.html.twig');
         } else {
             $listArticles = Blog::getPosts($blog_id);
             $tpl->assign('articles', $listArticles);
-            $blogLayout = $tpl->get_template('blog/blog.tpl');
+            $blogLayout = $tpl->get_template('blog/blog.html.twig');
         }
         break;
 }

+ 13 - 3
main/inc/lib/blog.lib.php

@@ -2800,7 +2800,7 @@ class Blog
             }
         }
 
-        $html .= '<table id="smallcalendar" class="table table-responsive">
+        $html .= '<table id="smallcalendar" class="table">
                 <tr id="title">
                 <th width="10%"><a href="'.$backwardsURL.'">&laquo;</a></th>
                 <th align="center" width="80%" colspan="5" class="month">'.$monthName.' '.$year.'</th>
@@ -2879,8 +2879,18 @@ class Blog
             'blog_admin.php?action=add'
         );
         $form->addElement('header', get_lang('AddBlog'));
-        $form->addElement('text', 'blog_name', get_lang('Title'));
-        $form->addElement('textarea', 'blog_subtitle', get_lang('SubTitle'));
+        $form->addText('blog_name',get_lang('Title'));
+        $form->addHtmlEditor(
+            'blog_subtitle',
+            get_lang('SubTitle'),
+            false,
+            false,
+            [
+                'ToolbarSet' => 'Profile',
+                'Width' => '100%',
+                'Height' => '130'
+            ]
+        );
         $form->addElement('hidden', 'new_blog_submit', 'true');
         $form->addButtonSave(get_lang('SaveProject'));
 

+ 38 - 41
main/template/default/blog/blog.html.twig

@@ -1,43 +1,6 @@
+{% autoescape false %}
 <div class="row">
-    <div class="col-md-3">
-        <div class="sidebar">
-            <div id="calendar-blog" class="panel panel-default">
-                <div class="panel-heading">
-                    {{ 'Calendar'|get_lang }}
-                </div>
-                <div class="panel-body">
-                    {{ calendar }}
-                </div>
-            </div>
-            <div id="search-blog" class="panel panel-default">
-                <div class="panel-heading">
-                    {{ 'Search'|get_lang }}
-                </div>
-                <div class="panel-body">
-                    <form action="blog.php" method="get" enctype="multipart/form-data">
-                        <div class="form-group">
-                            <input type="hidden" name="blog_id" value="{{ id_blog }}"/>
-                            <input type="hidden" name="action" value="view_search_result"/>
-                            <input type="text" class="form-control" size="20" name="q" value="{{ search }}"/>
-                        </div>
-                        <button class="btn btn-default btn-block" type="submit">
-                            <em class="fa fa-search"></em> {{ 'Search'|get_lang }}
-                        </button>
-                    </form>
-                </div>
-            </div>
-            <div id="task-blog" class="panel panel-default">
-                <div class="panel-heading">
-                    {{ 'MyTasks'|get_lang }}
-                </div>
-                <div class="panel-body">
-                    {{ task }}
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="col-md-9">
+    <div class="col-md-8">
         <div class="blog">
             <div id="blog-header">
                 {% if not search %}
@@ -56,8 +19,8 @@
             <div id="list-articles">
                 {% for item in articles %}
                     <article id="post-{{ item.id_post }}" class="article-post">
-                        <div class="panel panel-default">
-                            <div class="panel-body">
+                        <div class="card">
+                            <div class="card-body">
                                 <h3 class="title-post">
                                     <a href="{{ _p.web_self ~ '?' ~ _p.web_cid_query ~ '&' ~ {'action':'view_post', 'blog_id':item.id_blog, 'post_id':item.id_post}|url_encode }}#add_comment"
                                        title="{{ item.title }}">{{ item.title }}</a>
@@ -99,6 +62,39 @@
             </div>
         </div>
     </div>
+
+    <div class="col-md-4">
+        <div class="sidebar-blog">
+            <div id="calendar-blog" class="card">
+                <div class="card-body">
+                    <h5 class="card-title">{{ 'Calendar'|get_lang }}</h5>
+                    {{ calendar }}
+                </div>
+            </div>
+            <div id="search-blog" class="card">
+                <div class="card-body">
+                    <h5 class="card-title">{{ 'Search'|get_lang }}</h5>
+                    <form action="blog.php" method="get" enctype="multipart/form-data">
+                        <div class="form-group">
+                            <input type="hidden" name="blog_id" value="{{ id_blog }}"/>
+                            <input type="hidden" name="action" value="view_search_result"/>
+                            <input type="text" class="form-control" size="20" name="q" value="{{ search }}"/>
+                        </div>
+                        <button class="btn btn-primary btn-block" type="submit">
+                            <em class="fa fa-search"></em> {{ 'Search'|get_lang }}
+                        </button>
+                    </form>
+                </div>
+            </div>
+            <div id="task-blog" class="card">
+                <div class="card-body">
+                    <h5 class="card-title">{{ 'MyTasks'|get_lang }}</h5>
+                    {{ task }}
+                </div>
+            </div>
+        </div>
+    </div>
+
 </div>
 <script>
     $(document).on('ready', function () {
@@ -116,3 +112,4 @@
         });
     });
 </script>
+{% endautoescape %}

+ 2 - 0
main/template/default/blog/layout.html.twig

@@ -1,3 +1,4 @@
+{% autoescape false %}
 <div class="row">
     <div class="col-md-12">
         <div class="blog">
@@ -5,3 +6,4 @@
         </div>
     </div>
 </div>
+{% endautoescape %}

+ 36 - 40
main/template/default/blog/post.html.twig

@@ -1,3 +1,4 @@
+{% autoescape false %}
 {% macro comment_template(item) %}
     <div class="media {{ item.iid }}">
         <div class="media-left">
@@ -55,46 +56,9 @@
 {% import _self as nested %}
 
 <div class="row">
-    <div class="col-md-3">
-        <div class="sidebar">
-            <div id="calendar-blog" class="panel panel-default">
-                <div class="panel-heading">
-                    {{ 'Calendar'|get_lang }}
-                </div>
-                <div class="panel-body">
-                    {{ calendar }}
-                </div>
-            </div>
-            <div id="search-blog" class="panel panel-default">
-                <div class="panel-heading">
-                    {{ 'Search'|get_lang }}
-                </div>
-                <div class="panel-body">
-                    <form action="blog.php" method="get" enctype="multipart/form-data">
-                        <div class="form-group">
-                            <input type="hidden" name="blog_id" value="{{ id_blog }}"/>
-                            <input type="hidden" name="action" value="view_search_result"/>
-                            <input type="text" class="form-control" size="20" name="q" value="{{ search }}"/>
-                        </div>
-                        <button class="btn btn-default btn-block" type="submit">
-                            <em class="fa fa-search"></em> {{ 'Search'|get_lang }}
-                        </button>
-                    </form>
-                </div>
-            </div>
-            <div id="task-blog" class="panel panel-default">
-                <div class="panel-heading">
-                    {{ 'MyTasks'|get_lang }}
-                </div>
-                <div class="panel-body">
-                    {{ task }}
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="col-md-9">
+    <div class="col-md-8">
         <div class="blog" id="post-{{ post.id_post }}">
-            <div class="panel panel-default" id="blog-header">
+            <div class="card" id="blog-header">
                 <div class="panel-heading">
                     <div id="post-action" class="text-right">
                         <div class="btn-group btn-group-sm" role="group" aria-label="{{ 'Actions'|get_lang }}">
@@ -102,7 +66,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="panel-body">
+                <div class="card-body">
                     <article>
                         <div class="article-header">
                             <div class="title">
@@ -153,6 +117,37 @@
 
         </div>
     </div>
+    <div class="col-md-4">
+        <div class="sidebar-blog">
+            <div id="calendar-blog" class="card">
+                <div class="card-body">
+                    <h5 class="card-title">{{ 'Calendar'|get_lang }}</h5>
+                    {{ calendar }}
+                </div>
+            </div>
+            <div id="search-blog" class="card">
+                <div class="card-body">
+                    <h5 class="card-title">{{ 'Search'|get_lang }}</h5>
+                    <form action="blog.php" method="get" enctype="multipart/form-data">
+                        <div class="form-group">
+                            <input type="hidden" name="blog_id" value="{{ id_blog }}"/>
+                            <input type="hidden" name="action" value="view_search_result"/>
+                            <input type="text" class="form-control" size="20" name="q" value="{{ search }}"/>
+                        </div>
+                        <button class="btn btn-primary btn-block" type="submit">
+                            <em class="fa fa-search"></em> {{ 'Search'|get_lang }}
+                        </button>
+                    </form>
+                </div>
+            </div>
+            <div id="task-blog" class="card">
+                <div class="card-body">
+                    <h5 class="card-title">{{ 'MyTasks'|get_lang }}</h5>
+                    {{ task }}
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 
 <script>
@@ -176,3 +171,4 @@
         });
     });
 </script>
+{% endautoescape %}