Browse Source

add icons timeline actions fix select install

aragonc 9 years ago
parent
commit
7bb5748811

+ 0 - 14
app/Resources/public/css/base.css

@@ -3674,20 +3674,6 @@ a:active{
     width: 800px;
 }
 
-#my_timeline #next {
-    background: url("../../main/img/action_next.png") no-repeat transparent;
-    height: 32px;
-    width: 32px;
-    float:right;
-}
-
-#my_timeline #prev {
-    background: url("../../main/img/action_prev.png") no-repeat transparent;
-    height: 32px;
-    width: 32px;
-    float:left;
-}
-
 #dates .selected {
     font-size: 22px;
     font-weight: bold;

+ 16 - 12
main/auth/my_progress.php

@@ -16,12 +16,15 @@ $nameTools = get_lang('MyProgress');
 api_block_anonymous_users();
 
 $htmlHeadXtra[] = api_get_js('jquery.timelinr-0.9.5.js');
-$htmlHeadXtra[] = '
-<script language="javascript">
+$htmlHeadXtra[] = "
+<script language='javascript'>
 $(function() {
-    $().timelinr();
+    $().timelinr({
+        containerDiv: '#my_timeline',
+        autoPlayPause: 2000
+    })
 });
-</script>';
+</script>";
 
 $user_id = api_get_user_id();
 $course_user_list = CourseManager::get_courses_list_by_user_id($user_id);
@@ -70,15 +73,16 @@ $content .= Tracking::show_course_detail(api_get_user_id(), $courseCode, $sessio
 
 if (!empty($dates)) {
     if (!empty($content)) {
-        $content .= '<br /><br />';
+        $content .= '';
     }
-    $content .= '<div class="row"><div class="col-md-12">'.Display::page_subheader(get_lang('Timeline')).'</div>';
-    $content .= '<div id="my_timeline">
-        <div class="actions">
-            <a href="#" id="prev"></a> <!-- optional -->
-            <a href="#" id="next"></a> <!-- optional -->
-        </div>
-    <ul id="dates">
+    $content .= '<div class="row"><div class="col-md-12">'.Display::page_subheader(get_lang('Timeline'));
+    $content .= '<div id="my_timeline">';
+    
+    $actionsLeft = '<a href="#" id="prev">' . Display::return_icon('previous.png',  get_lang('Previous'), null, ICON_SIZE_MEDIUM) . '</a>';
+    $actionsRight = '<a href="#" id="next">' . Display::return_icon('next.png',  get_lang('Next'), null, ICON_SIZE_MEDIUM) . '</a>';
+    $content .= Display::toolbarAction('toolbar-linetime',array(0 => $actionsLeft, 1 => $actionsRight), 2, true);
+    
+    $content .= '<ul id="dates">
         '.$dates.'
     </ul>
     <ul id="issues">

BIN
main/img/icons/32/next.png


BIN
main/img/icons/32/previous.png


+ 4 - 4
main/img/icons/svg/lock-closed.svg

@@ -42,7 +42,7 @@
      showgrid="false"
      inkscape:zoom="2.4583333"
      inkscape:cx="51.94532"
-     inkscape:cy="22.7019"
+     inkscape:cy="55.244273"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
@@ -50,9 +50,9 @@
   <g
      id="g3354"
      transform="matrix(5.3333333,0,0,5.3333333,0,-0.38351889)"
-     inkscape:export-filename="/var/www/chamilo/main/img/icons/32/lock-closed.png"
-     inkscape:export-xdpi="22.5"
-     inkscape:export-ydpi="22.5">
+     inkscape:export-filename="/var/www/chamilo/main/img/icons/16/lock-closed.png"
+     inkscape:export-xdpi="11.25"
+     inkscape:export-ydpi="11.25">
     <g
        id="g4"
        transform="translate(0,-1028.8281)">

+ 3 - 3
main/img/icons/svg/lock-open.svg

@@ -50,9 +50,9 @@
   <g
      id="g4178"
      transform="scale(5.3333333,5.3333333)"
-     inkscape:export-filename="/var/www/chamilo/main/img/icons/32/lock-open.png"
-     inkscape:export-xdpi="22.5"
-     inkscape:export-ydpi="22.5">
+     inkscape:export-filename="/var/www/chamilo/main/img/icons/22/lock-open.png"
+     inkscape:export-xdpi="15.46875"
+     inkscape:export-ydpi="15.46875">
     <rect
        y="-3.4724426e-08"
        x="3.1274987e-09"

+ 4 - 4
main/inc/lib/dashboard.lib.php

@@ -386,7 +386,7 @@ class DashboardManager
 					echo '<td>'.$block['name'].'</td>';
 					echo '<td>'.$block['description'].'</td>';
 					echo '<td>
-                            <select name="columns['.$block['id'].']">
+                            <select class="selectpicker show-tick form-control" name="columns['.$block['id'].']">
                             <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==1?'selected':'').' >1</option>
                             <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==2?'selected':'').' >2</option>
                             </select>
@@ -398,10 +398,10 @@ class DashboardManager
 			}
 
 			echo '</table>';
-			echo '<br />';
-			echo '<button class="btn btn-default" type="submit" name="submit_dashboard_list" value="'.get_lang('EnableDashboardBlock').'">'.
+			echo '<div class="row"><div class="col-md-12">';
+			echo '<button class="btn btn-default" type="submit" name="submit_dashboard_list" value="'.get_lang('EnableDashboardBlock').'"><i class="fa fa-check-square"></i> '.
                 get_lang('EnableDashboardBlock').'</button></form>';
-			echo '</div>';
+			echo '</div></div>';
 		} else {
 			echo '<div style="margin-top:20px">'.get_lang('ThereAreNoEnabledDashboardPlugins').'</div>';
 			if (api_is_platform_admin()) {

+ 3 - 0
main/install/index.php

@@ -303,11 +303,14 @@ if ($encryptPassForm == '1') {
     <title>&mdash; <?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title>
     <style type="text/css" media="screen, projection">
         @import "../../web/assets/bootstrap/dist/css/bootstrap.min.css";
+        @import "<?php echo api_get_path(WEB_CSS_PATH)?>bootstrap-select.css";
         @import "../../web/assets/fontawesome/css/font-awesome.min.css";
         @import "../../web/css/base.css";
         @import "../../web/css/themes/chamilo/default.css";
     </style>
     <script type="text/javascript" src="../../web/assets/jquery/dist/jquery.min.js"></script>
+    <script type="text/javascript" src="../../web/assets/bootstrap/dist/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="<?php echo api_get_path(WEB_LIBRARY_PATH)?>javascript/bootstrap-select.min.js"></script>
     <script type="text/javascript">
         $(document).ready( function() {
             $("#button_please_wait").hide();

+ 5 - 5
main/install/install.lib.php

@@ -610,7 +610,7 @@ function display_language_selection_box($name = 'language_list', $default_langua
 
     // Displaying the box.
     $html = '';
-    $html .= "\t\t<select class='form-control' name=\"$name\">\n";
+    $html .= "\t\t<select class='selectpicker show-tick' name=\"$name\">\n";
     foreach ($language_list as $key => $value) {
         if ($key == $default_language) {
             $option_end = ' selected="selected">';
@@ -1157,7 +1157,7 @@ function get_contact_registration_form()
     <div class="form-group">
             <label class="col-sm-3"><span class="form_required">*</span>'.get_lang('CompanyActivity').'</label>
             <div class="col-sm-9">
-                    <select name="company_activity" id="company_activity" >
+                    <select class="selectpicker show-tick" name="company_activity" id="company_activity" >
                             <option value="">--- '.get_lang('SelectOne').' ---</option>
                             <Option value="Advertising/Marketing/PR">Advertising/Marketing/PR</Option><Option value="Agriculture/Forestry">Agriculture/Forestry</Option>
                             <Option value="Architecture">Architecture</Option><Option value="Banking/Finance">Banking/Finance</Option>
@@ -1181,7 +1181,7 @@ function get_contact_registration_form()
     <div class="form-group">
             <label class="col-sm-3"><span class="form_required">*</span>'.get_lang('PersonRole').'</label>
             <div class="col-sm-9">
-                    <select name="person_role" id="person_role" >
+                    <select class="selectpicker show-tick" name="person_role" id="person_role" >
                             <option value="">--- '.get_lang('SelectOne').' ---</option>
                             <Option value="Administration">Administration</Option><Option value="CEO/President/ Owner">CEO/President/ Owner</Option>
                             <Option value="CFO">CFO</Option><Option value="CIO/CTO">CIO/CTO</Option>
@@ -1211,7 +1211,7 @@ function get_contact_registration_form()
     <div class="form-group">
             <label class="col-sm-3">'.get_lang('WhichLanguageWouldYouLikeToUseWhenContactingYou').'</label>
             <div class="col-sm-9">
-                    <select id="language" name="language">
+                    <select class="selectpicker show-tick" id="language" name="language">
                             <option value="bulgarian">Bulgarian</option>
                             <option value="indonesian">Bahasa Indonesia</option>
                             <option value="bosnian">Bosanski</option>
@@ -1765,7 +1765,7 @@ function get_countries_list_from_array($combo = false)
 
     $country_select = '';
     if ($combo) {
-        $country_select = '<select id="country" name="country">';
+        $country_select = '<select class="selectpicker show-tick" id="country" name="country">';
         $country_select .= '<option value="">--- '.get_lang('SelectOne').' ---</option>';
         foreach ($a_countries as $country) {
             $country_select .= '<option value="'.$country.'">'.$country.'</option>';