Преглед на файлове

template design changes OFAJ

Alex Aragon преди 8 години
родител
ревизия
cbadb097d5

+ 24 - 13
app/Resources/public/css/themes/rainbow/default.css

@@ -17,7 +17,7 @@ body {
   background: url('images/bg.png') center center repeat-x;
 }
 a {
-  color: #07578A;
+  color: #162A83;
   text-decoration: none;
 }
 a:hover,
@@ -34,10 +34,8 @@ a:focus {
     margin-top: 0;
 }
 .home-information{
-    margin-top: 20px;
-    padding-top: 20px;
-    margin-bottom: 20px;
-    padding-bottom: 20px;
+    margin: 0;
+    padding: 0;
 }
 .home-information .title{
     position: static;
@@ -45,7 +43,7 @@ a:focus {
     margin-top: 20px;
     margin-bottom: 12px;
     font-weight: bold;
-    color: #07578A;
+    color: #162A83;
 }
 .home-information .item-icon{
     text-align: center;
@@ -131,6 +129,16 @@ a:focus {
 .navbar-right{
  margin-right: 0;   
 }
+.partners{
+    padding-bottom: 10px;
+    padding-top: 10px;
+    text-align: center;
+}
+.partners a{
+    display: inline-block;
+    padding-left: 10px;
+    padding-right: 10px;
+}
 /* Menu Option */
 .item-menu{
     text-align: center;
@@ -181,7 +189,7 @@ a:focus {
     margin-top: 10px;
 }
 .section-notice .items .title a{
-    color: #07578A;
+    color: #162A83;
     font-size: 20px;
     font-weight: 700;
 }
@@ -237,9 +245,8 @@ a:focus {
     margin: 0;
 }
 .welcome-home-top-temp{
-    padding-top: 15px;
-    padding-bottom: 15px;
-    margin-bottom: 15px;
+   padding: 0;
+   margin: 0;
 }
 .welcome-home-top-temp h1{
     color: #E53140;
@@ -248,7 +255,7 @@ a:focus {
     font-size: 20px;
 }
 #carousel-announcement .carousel-indicators .active{
-    background: #009EE0;
+    background: #162A83;
 }
 .carousel-indicators li{
     border: none;
@@ -262,7 +269,7 @@ a:focus {
 }
 .carousel-control:focus, .carousel-control:hover{
     opacity: 1;
-    color: #009EE0;
+    color: #162A83;
 }
 .navbar{
   border-radius: 0;
@@ -395,8 +402,12 @@ a:focus {
   background:#3C4147 !important;
   color: #fff;
 }
+.grid-courses .items .title{
+    font-size: 12px;
+    font-weight: bold;
+}
 .badge-warning{
-  background-color: #FD6600;
+  background-color: #6D237D;
 }
 .breadcrumb{
   padding: 8px 15px;

BIN
app/Resources/public/css/themes/rainbow/images/logo_cavilam.png


BIN
app/Resources/public/css/themes/rainbow/images/rbs_logo_rgb.png


+ 5 - 5
main/inc/lib/display.lib.php

@@ -1685,26 +1685,26 @@ class Display
         }
 		$accesses =  isset($point_info['accesses']) ? $point_info['accesses'] : 0;
 
-		$star_label = sprintf(get_lang('XStarsOutOf5'), $point_info['point_average_star']);
+		/* $star_label = sprintf(get_lang('XStarsOutOf5'), $point_info['point_average_star']);
 
-        $html = '<ul id="'.$id.'" class="star-rating">
+         $html = '<ul id="'.$id.'" class="star-rating">
 					<li class="current-rating" style="width:'.$percentage.'px;"></li>
 					<li><a href="javascript:void(0);" data-link="'.$url.'&amp;star=1" title="'.$star_label.'" class="one-star">1</a></li>
 					<li><a href="javascript:void(0);" data-link="'.$url.'&amp;star=2" title="'.$star_label.'" class="two-stars">2</a></li>
 					<li><a href="javascript:void(0);" data-link="'.$url.'&amp;star=3" title="'.$star_label.'" class="three-stars">3</a></li>
 					<li><a href="javascript:void(0);" data-link="'.$url.'&amp;star=4" title="'.$star_label.'" class="four-stars">4</a></li>
 					<li><a href="javascript:void(0);" data-link="'.$url.'&amp;star=5" title="'.$star_label.'" class="five-stars">5</a></li>
-				</ul>';
+				</ul>'; */
 
 		$labels = array();
 
-		$labels[]= $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes');
+		//$labels[]= $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes');
 		$labels[]= $accesses == 1 ? $accesses.' '.get_lang('Visit') : $accesses.' '.get_lang('Visits');
 		/* if (!empty($number_of_users_who_voted)) {
 			$labels[]= get_lang('Average').' '.$point_info['point_average_star'].'/5';
 		} */
 
-		$labels[]= $point_info['user_vote']  ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : get_lang('YourVote'). ' [?] ';
+		//$labels[]= $point_info['user_vote']  ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : get_lang('YourVote'). ' [?] ';
 
 		if (!$add_div_wrapper && api_is_anonymous()) {
 			$labels[]= Display::tag('span', get_lang('LoginToVote'), array('class' => 'error'));

+ 1 - 1
main/inc/lib/userportal.lib.php

@@ -1506,7 +1506,7 @@ class IndexManager
      */
     public function return_hot_courses()
     {
-        return CourseManager::return_hot_courses(30, 6);
+        return CourseManager::return_hot_courses(30, 4);
     }
 
     /**

+ 1 - 1
main/template/rainbow/layout/footer.tpl

@@ -4,9 +4,9 @@
         {{ plugin_pre_footer }}
     </div>
 {% endif %}
-
 <footer class="sticky-footer"> <!-- start of #footer section -->
     <div class="container">
+        
         <div class="row">
             <div id="footer_left" class="col-md-4">
                 {% if session_teachers is not null %}

+ 3 - 3
main/template/rainbow/layout/layout_2_col.tpl

@@ -28,9 +28,9 @@
     <div class="row">
         <div class="col-md-12">
             {% if home_page_block %}
-            <section id="homepage-home">
-                {{ home_page_block }}
-            </section>
+                <section id="homepage-home">
+                    {{ home_page_block }}
+                </section>
             {% endif %}
             <div class="home-information">
                 <div class="row">

+ 12 - 1
main/template/rainbow/layout/main.tpl

@@ -7,7 +7,18 @@
 	 	{% include template ~ "/layout/sniff.tpl" %}
 	{% endif %}
 {% endblock %}
-
+<div class="sub-footer">
+    <div class="container">
+        <div class="row">
+                <div class="col-md-12">
+                    <div class="partners">
+                        <a href="#"><img src="{{ _p.web_css_theme }}images/rbs_logo_rgb.png"/></a>
+                        <a href="#"><img src="{{ _p.web_css_theme }}images/logo_cavilam.png"/></a>
+                    </div>
+                </div>
+        </div>
+    </div>
+</div>
 {% block footer %}
    
     {% if show_footer == true %}

+ 2 - 4
main/template/rainbow/layout/menu.tpl

@@ -12,7 +12,6 @@
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="menuone">
             <ul class="nav navbar-nav">
-
                 {% if _u.logged == 1 %}
                     {% for items in menu %}
                         {% if items.key != 'profile' and items.key != 'dashboard' and items.key != 'admin' and items.key != 'agenda' %}
@@ -53,12 +52,13 @@
                             </div>
                         </li>
                         <li role="separator" class="divider"></li>
-
                         <li class="user-body">
+                            {% if _us.is_admin == 1 %}
                             <a href="{{ _p.web }}main/admin">
                                 <em class="fa fa-cog" aria-hidden="true"></em>
                                 {{ "NomPageAdmin"|get_lang }}
                             </a>
+                            {% endif %}
                             <a href="{{ _p.web }}main/calendar/agenda_js.php?type=personal">
                                 <em class="fa fa-calendar" aria-hidden="true"></em>
                                 {{ "AllowPersonalAgendaTitle"|get_lang }}
@@ -75,8 +75,6 @@
                         </li>
                     </ul>
                 </li>
-
-
                {% endif %}
             </ul>
             {% endif %}