Răsfoiți Sursa

Minor style changes - Removing well2 and well3 CSS classes

Julio Montoya 13 ani în urmă
părinte
comite
ef66a85846

+ 10 - 7
main/admin/index.php

@@ -60,7 +60,7 @@ $blocks['users']['label'] = api_ucfirst(get_lang('Users'));
 
 if (api_is_platform_admin()) {	
 	$search_form = ' <form method="get" action="user_list.php">
-						<input type="text" name="keyword" value="">
+						<input class="span3" type="text" name="keyword" value="">
 						<button class="search" type="submit">'.get_lang('Search').'</button>
             		</form>';
 	$blocks['users']['search_form'] = $search_form;	
@@ -94,7 +94,7 @@ if (api_is_platform_admin()) {
 	$blocks['courses']['label'] = api_ucfirst(get_lang('Courses'));
 	
 	$search_form = ' <form method="get" action="course_list.php">
-							<input type="text" name="keyword" value="">
+							<input class="span3" type="text" name="keyword" value="">
 							<button class="search" type="submit">'.get_lang('Search').'</button>
 	            		</form>';
 	$blocks['courses']['search_form'] = $search_form;
@@ -129,7 +129,7 @@ if (api_is_platform_admin()) {
     $blocks['platform']['label'] = api_ucfirst(get_lang('Platform'));    
     
     $search_form = ' <form method="get" action="settings.php" class="form-search">
-							<input type="text" name="search_field" value="" >
+							<input class="span3" type="text" name="search_field" value="" >
                             <input type="hidden" value="search_setting" name="category">
 							<button class="search" type="submit">'.get_lang('Search').'</button>
 	            		</form>';
@@ -169,7 +169,7 @@ if (api_get_setting('use_session_mode') == 'true') {
 	$blocks['sessions']['label'] = api_ucfirst(get_lang('Sessions'));
 	
 	$search_form = ' <form method="POST" action="session_list.php">
-								<input type="text" name="keyword" value="">
+								<input class="span3" type="text" name="keyword" value="">
 								<button class="search" type="submit">'.get_lang('Search').'</button>
 		            		</form>';
 	$blocks['sessions']['search_form'] = $search_form;	
@@ -200,7 +200,7 @@ if (api_get_setting('use_session_mode') == 'true') {
 	$blocks['classes']['label'] = api_ucfirst(get_lang('AdminClasses'));
 	
 	$search_form = ' <form method="POST" action="class_list.php">
-									<input type="text" name="keyword" value="">
+									<input class="span3" type="text" name="keyword" value="">
 									<button class="search" type="submit">.'.get_lang('Search').'</button>
 			            		</form>';
 	$blocks['classes']['search_form'] = $search_form;
@@ -231,7 +231,10 @@ if (api_is_platform_admin()) {
 	}
 	if (api_is_global_platform_admin()) {
 		$items[] = array('url'=>'archive_cleanup.php', 	'label' => get_lang('ArchiveDirCleanup'));
-	}	
+	}
+    
+    //$items[] = array('url'=>'statistics/index.php?action=activities', 	'label' => get_lang('ImportantActivities'));
+    
 	$blocks['settings']['items'] = $items;
 
 	/* Extensions */
@@ -384,4 +387,4 @@ function check_system_version() {
         $output = '<span style="color:red">' . get_lang('AllowurlfopenIsSetToOff') . '</span>';
     }
     return $output;
-}
+}

+ 8 - 20
main/css/base.css

@@ -102,20 +102,14 @@ form .formw input {
     padding: 20px 0px 0px 20px;
 }
 
-.well2 {
-    background-color: #F5F5F5;
-    border: 1px solid rgba(0, 0, 0, 0.05);
+.well_border {            
+    /* border: 1px solid rgba(0, 0, 0, 0.05);*/
+    border: 1px solid #E1E1E0;
     border-radius: 4px 4px 4px 4px;
     box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) inset;
     margin-bottom: 20px;
     min-height: 20px;
-    padding: 19px 0px 19px 0px;
-}
-
-.well3 {            
-    margin-bottom: 10px;
-    min-height: 20px;
-    padding: 19px 0px 19px 0px;
+    padding: 19px;
 }
 
 #progress_bar img {
@@ -245,12 +239,12 @@ a.tag {
     white-space: nowrap;
 }
 
-img {
-    border: none;
-}
-
 /* User portal */
 
+.course_item {
+    padding-bottom:40px;
+}
+
 /* user_portal course status icon */
 .coursestatusicons {
     border: 0px solid #000;
@@ -3410,12 +3404,6 @@ a:active{
     margin-bottom: 10px;
 }
 
-
-/* Portal administration input text width */
-#settings input[type="text"] {
-    width:250px;
-}
-
 .welcome_course li {
     float:left;
     list-style-type: none;

+ 6 - 6
main/inc/lib/course.lib.php

@@ -2706,13 +2706,13 @@ class CourseManager {
     
     public function course_item_html($params, $is_sub_content = false) {
         $html = '';
-        $class = "well2";
+        $class = "well course_item";
         if ($is_sub_content) {
             $class = "";
         }        
-        $html .= '<div class="row-fluid '.$class.'">';         
-            $html .= '<div class="span10">';         
-                $html .= '<div class="well3">'; 
+        $html .= '<div class="row-fluid">';         
+            //$html .= '<div class="span9">';         
+                $html .= '<div class="'.$class.'">'; 
                     $html .= '<div class="span1">'.$params['icon'].'</div>';
                     $html .= '<div class="span5">';
                     $html .= '<h4>'.$params['title'].$params['notifications'].'</h4>';
@@ -2726,13 +2726,13 @@ class CourseManager {
                     $html .= '</div>';                        
                     $html .= '<div class="span1 pull-right">'.$params['right_actions'].'</div>';        
                 $html .= '</div>';
-            $html .= '</div>';
+            //$html .= '</div>';
         $html .= '</div>';
         return $html;
     }
     
     public function course_item_parent($main_content, $sub_content, $sub_sub_content = null) {
-        return '<div class="well2">'.$main_content.$sub_content.$sub_sub_content.'</div>';
+        return '<div class="well">'.$main_content.$sub_content.$sub_sub_content.'</div>';
     }
 
     /**

+ 7 - 5
main/newscorm/lp_view.php

@@ -324,8 +324,9 @@ if (Database::num_rows($res_media) > 0) {
         -->
         <div id="author_image" name="author_image" class="row-fluid">        
             <div class="span12">
-                <div class="row-fluid well2">     
-                    <div class="span4">
+                <div class="well">
+                <div class="row-fluid">                         
+                    <div class="span5">                        
                         <?php
                         if ($_SESSION['oLP']->get_preview_image()!='') {
                             $picture = getimagesize(api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/learning_path/images/'.$_SESSION['oLP']->get_preview_image());
@@ -336,11 +337,11 @@ if (Database::num_rows($res_media) > 0) {
                         } else {
                             echo Display :: display_icon('unknown_250_100.jpg');
                         }
-                        ?>                                           
+                        ?>                              
                     </div>
-                    <div id="lp_navigation_elem" class="span8">
+                    <div id="lp_navigation_elem" class="span7">
                         <div class="row">                        
-                            <div class="span8">
+                            <div class="span7">
                                 <?php echo $navigation_bar; ?>
                                  <div id="progress_bar">
                                     <?php echo $progress_bar; ?>
@@ -349,6 +350,7 @@ if (Database::num_rows($res_media) > 0) {
                         </div>              
                     </div>
                     </div>
+                    </div>
             </div>
        </div>
         

+ 14 - 10
main/template/default/admin/settings_index.tpl

@@ -17,19 +17,23 @@ $(function() {
         <li><a href="#tabs-8">Aenean lacinia</a></li>        
     </ul>
     -->        
+    <div class="row">
     {foreach $blocks as $key => $block name=block_loop  }        
-        <div id="tabs-{$smarty.foreach.block_loop.index +1}" class="admin_section">
-    	   <h4>{$block.icon} {$block.label}</h4>
-    	   <div style="list-style-type:none">
-    			{$block.search_form}
-    	   </div>
-    		{if $block.items}
-    	    	<ul>
+        <div id="tabs-{$smarty.foreach.block_loop.index +1}" class="span6">
+            <div class="well_border">
+                <h4>{$block.icon} {$block.label}</h4>
+                <div style="list-style-type:none">
+                    {$block.search_form}
+                </div>
+                {if $block.items}
+                    <ul>
     		    	{foreach $block.items as $url}
     		    		<li><a href="{$url.url}">{$url.label}</a></li>	    	
     				{/foreach}
-    			</ul>    	
-        	{/if}
-        </div>
+                    </ul>    	
+                {/if}
+            </div>
+        </div>        
     {/foreach}
+    </div>
 </div>