Minor - format code.

1.10.x
Julio Montoya 10 years ago
parent fc3f315b93
commit 55a2da6772
  1. 13
      main/dashboard/dashboard.php
  2. 15
      main/dashboard/dashboard_controller.php
  3. 3
      main/dashboard/index.php
  4. 18
      main/inc/lib/dashboard.lib.php

@ -20,9 +20,11 @@ if(isset($_GET['view']) && in_array($_GET['view'], $views)){
$link_blocks_view = $link_list_view = null; $link_blocks_view = $link_list_view = null;
if (isset($dashboard_view) && $dashboard_view == 'list') { if (isset($dashboard_view) && $dashboard_view == 'list') {
$link_blocks_view = '<a href="'.api_get_self().'?view=blocks">'.Display::return_icon('blocks.png',get_lang('DashboardBlocks'),'',ICON_SIZE_MEDIUM).'</a>'; $link_blocks_view = '<a href="'.api_get_self().'?view=blocks">'.
Display::return_icon('blocks.png',get_lang('DashboardBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
} else { } else {
$link_list_view = '<a href="'.api_get_self().'?view=list">'.Display::return_icon('edit.png',get_lang('EditBlocks'),'',ICON_SIZE_MEDIUM).'</a>'; $link_list_view = '<a href="'.api_get_self().'?view=list">'.
Display::return_icon('edit.png',get_lang('EditBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
} }
$configuration_link = null; $configuration_link = null;
@ -37,11 +39,6 @@ echo '</div>';
// block dashboard view // block dashboard view
if (isset($dashboard_view) && $dashboard_view == 'blocks') { if (isset($dashboard_view) && $dashboard_view == 'blocks') {
if (isset($msg)) {
//Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccessfully'));
}
if (count($blocks) > 0) { if (count($blocks) > 0) {
$columns = array(); $columns = array();
// group content html by number of column // group content html by number of column
@ -96,4 +93,4 @@ if (isset($dashboard_view) && $dashboard_view == 'blocks') {
} }
$user_id = api_get_user_id(); $user_id = api_get_user_id();
DashboardManager::display_user_dashboard_list($user_id); DashboardManager::display_user_dashboard_list($user_id);
} }

@ -6,6 +6,7 @@
* the requested action * the requested action
* This file contains class used like controller, it should be included inside a dispatcher file (e.g: index.php) * This file contains class used like controller, it should be included inside a dispatcher file (e.g: index.php)
* @author Christian Fasanando <christian1827@gmail.com> * @author Christian Fasanando <christian1827@gmail.com>
*
* @package chamilo.dashboard * @package chamilo.dashboard
*/ */
class DashboardController class DashboardController
@ -17,7 +18,8 @@ class DashboardController
/** /**
* Constructor * Constructor
*/ */
public function __construct() { public function __construct()
{
$this->user_id = api_get_user_id(); $this->user_id = api_get_user_id();
$this->toolname = 'dashboard'; $this->toolname = 'dashboard';
$this->view = new View($this->toolname); $this->view = new View($this->toolname);
@ -28,8 +30,8 @@ class DashboardController
* @param string message (optional) * @param string message (optional)
* render to dashboard.php view * render to dashboard.php view
*/ */
public function display($msg = false) { public function display($msg = false)
{
$data = array(); $data = array();
$user_id = $this->user_id; $user_id = $this->user_id;
@ -85,8 +87,8 @@ class DashboardController
* This method allow store user blocks from dashboard manager * This method allow store user blocks from dashboard manager
* render to dashboard.php view * render to dashboard.php view
*/ */
public function store_user_block() { public function store_user_block()
{
$data = array(); $data = array();
$user_id = $this->user_id; $user_id = $this->user_id;
if (strtoupper($_SERVER['REQUEST_METHOD']) == "POST") { if (strtoupper($_SERVER['REQUEST_METHOD']) == "POST") {
@ -111,7 +113,8 @@ class DashboardController
* This method is used when you close a block from dashboard block interface * This method is used when you close a block from dashboard block interface
* render to dashboard.php view * render to dashboard.php view
*/ */
public function close_user_block($path) { public function close_user_block($path)
{
$user_id = $this->user_id; $user_id = $this->user_id;
$result = DashboardManager::close_user_block($user_id, $path); $result = DashboardManager::close_user_block($user_id, $path);
$this->display($result); $this->display($result);

@ -32,9 +32,6 @@ if (isset($_GET['action']) && in_array($_GET['action'],$actions)) {
$dashboar_plugin_styles = DashboardManager::get_links_for_styles_from_dashboard_plugins(); $dashboar_plugin_styles = DashboardManager::get_links_for_styles_from_dashboard_plugins();
$htmlHeadXtra[] = $dashboar_plugin_styles; $htmlHeadXtra[] = $dashboar_plugin_styles;
// interbreadcrumb
//$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('Dashboard'));
// course description controller object // course description controller object
$dashboard_controller = new DashboardController(); $dashboard_controller = new DashboardController();

@ -101,7 +101,8 @@ class DashboardManager
echo '</table>'; echo '</table>';
echo '<br />'; echo '<br />';
echo '<button class="save" type="submit" name="submit_dashboard_plugins" value="'.get_lang('EnableDashboardPlugins').'">'.get_lang('EnableDashboardPlugins').'</button></form>'; echo '<button class="btn btn-default" type="submit" name="submit_dashboard_plugins" value="'.get_lang('EnableDashboardPlugins').'">'.
get_lang('EnableDashboardPlugins').'</button></form>';
} }
/** /**
@ -334,9 +335,8 @@ class DashboardManager
* @param int User id * @param int User id
* @return void * @return void
*/ */
public static function display_user_dashboard_list($user_id) { public static function display_user_dashboard_list($user_id)
{
$block_data_without_plugin = self::get_block_data_without_plugin();
$enabled_dashboard_plugins = self::get_enabled_dashboard_blocks(); $enabled_dashboard_plugins = self::get_enabled_dashboard_blocks();
$user_block_data = self::get_user_block_data($user_id); $user_block_data = self::get_user_block_data($user_id);
@ -382,11 +382,11 @@ class DashboardManager
self::display_user_dashboard_list_checkboxes($user_id, $block['id']); self::display_user_dashboard_list_checkboxes($user_id, $block['id']);
echo '<td>'.$block['name'].'</td>'; echo '<td>'.$block['name'].'</td>';
echo '<td>'.$block['description'].'</td>'; echo '<td>'.$block['description'].'</td>';
echo '<td><center> echo '<td>
<select name="columns['.$block['id'].']"> <select 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="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> <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==2?'selected':'').' >2</option>
</select></center> </select>
</td>'; </td>';
echo '</tr>'; echo '</tr>';
} else { } else {
@ -396,12 +396,14 @@ class DashboardManager
echo '</table>'; echo '</table>';
echo '<br />'; echo '<br />';
echo '<button class="save" type="submit" name="submit_dashboard_list" value="'.get_lang('EnableDashboardBlock').'">'.get_lang('EnableDashboardBlock').'</button></form>'; echo '<button class="btn btn-default" type="submit" name="submit_dashboard_list" value="'.get_lang('EnableDashboardBlock').'">'.
get_lang('EnableDashboardBlock').'</button></form>';
echo '</div>'; echo '</div>';
} else { } else {
echo '<div style="margin-top:20px">'.get_lang('ThereAreNoEnabledDashboardPlugins').'</div>'; echo '<div style="margin-top:20px">'.get_lang('ThereAreNoEnabledDashboardPlugins').'</div>';
if (api_is_platform_admin()) { if (api_is_platform_admin()) {
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">'.get_lang('ConfigureDashboardPlugin').'</a>'; echo '<a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">'.
get_lang('ConfigureDashboardPlugin').'</a>';
} }
} }
} }

Loading…
Cancel
Save