From f6882239e6654048ab0dde457c43289506b4e9de Mon Sep 17 00:00:00 2001 From: Patrick Cool Date: Wed, 15 Apr 2009 10:41:45 +0200 Subject: [PATCH] [svn r19776] form titles form consistency page layout consistancy breadcrumbs --- main/dropbox/dropbox_functions.inc.php | 150 ++++++++++++++----------- main/dropbox/dropbox_init.inc.php | 38 ++++++- main/dropbox/index.php | 78 ++++++++----- 3 files changed, 173 insertions(+), 93 deletions(-) diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php index 20920f2994..9faddb82ea 100644 --- a/main/dropbox/dropbox_functions.inc.php +++ b/main/dropbox/dropbox_functions.inc.php @@ -162,20 +162,38 @@ function delete_category($action, $id) */ function display_move_form($part, $id, $target=array()) { - $message=get_lang('MoveFileTo'); - $message.='
'; - $message.=''; - $message.=''; - $message.=''; + echo ''; + echo ' +
+
+ * '.get_lang('MoveFileTo').' +
+
'; + echo ''; - $message.=''; - $message.=''; - Display :: display_normal_message($message,false); + echo ''; + echo '
+
'; + + echo ' +
+
+
+
+ +
+
+ '; + echo ''; + + echo '
'; } /** @@ -439,30 +457,32 @@ function display_addcategory_form($category_name='', $id='') echo "
\n"; - echo ''.$title.''; if (isset($id) AND $id<>'') { echo ''; } echo ''; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "
\n"; - echo get_lang('CategoryName').': '; - echo "\t\n"; - echo ""; - echo "\t
\n"; - echo "\t\n"; - echo ""; - echo "\t
\n"; + + echo '
'.$title.'
'; + + echo '
+
+ *'.get_lang('CategoryName').' +
+
+ +
+
'; + + echo '
+
+
+
+ +
+
'; echo "
"; + echo '
'; } /** @@ -479,12 +499,14 @@ function display_add_form() $dropbox_person = new Dropbox_Person( $_user['user_id'], $is_courseAdmin, $is_courseTutor); ?>
" enctype="multipart/form-data" onsubmit="return checkForm(this)"> - - - - - + + + - - - - + + - - - - - - - ", - "", - "", - "
- : - + +
+ +
+
+ *: +
+
/> @@ -495,36 +517,30 @@ function display_add_form() echo ""; } ?> -
- : - - -
- : - +
+
+ +
+
'.dropbox_lang("justUploadInSelect").''; } - echo "", - "
", - "
", - "
"; + echo ' + + '; + + echo ' +
+
+
+
+ +
+
+ '; + + echo ""; } /** diff --git a/main/dropbox/dropbox_init.inc.php b/main/dropbox/dropbox_init.inc.php index 41801a50d3..34031d7b1f 100644 --- a/main/dropbox/dropbox_init.inc.php +++ b/main/dropbox/dropbox_init.inc.php @@ -283,11 +283,43 @@ if((!$is_allowed_in_course || !$is_courseMember) && !api_is_allowed_to_edit()) /* ============================================================================== - HEADER & TITLE + BREADCRUMBS ============================================================================== */ +if (!$_GET['view'] OR $_GET['view']=='received') +{ + $interbreadcrumb[] = array ("url" => "../dropbox/index.php", "name" => dropbox_lang("dropbox", "noDLTT")); + $nameTools = get_lang('ReceivedFiles'); + + if ($_GET['action'] == 'addreceivedcategory') + { + $interbreadcrumb[] = array ("url" => "../dropbox/index.php?view=received", "name" => get_lang("ReceivedFiles")); + $nameTools = get_lang('AddNewCategory'); + } +} +if ($_GET['view']=='sent') +{ + $interbreadcrumb[] = array ("url" => "../dropbox/index.php", "name" => dropbox_lang("dropbox", "noDLTT")); + $nameTools = get_lang('SentFiles'); + + if ($_GET['action'] == 'addsentcategory') + { + $interbreadcrumb[] = array ("url" => "../dropbox/index.php?view=sent", "name" => get_lang("SentFiles")); + $nameTools = get_lang('AddNewCategory'); + } + if ($_GET['action'] == 'add') + { + $interbreadcrumb[] = array ("url" => "../dropbox/index.php?view=sent", "name" => get_lang("SentFiles")); + $nameTools = get_lang('UploadNewFile'); + } +} -$nameTools = dropbox_lang("dropbox", "noDLTT"); + +/* +============================================================================== + HEADER & TITLE +============================================================================== +*/ if ($origin != 'learnpath') { @@ -299,5 +331,5 @@ else // if we come from the learning path we have to include the stylesheet and echo $javascript; } -api_display_tool_title($nameTools); +// api_display_tool_title($nameTools); ?> \ No newline at end of file diff --git a/main/dropbox/index.php b/main/dropbox/index.php index e0289f50f3..59caada958 100644 --- a/main/dropbox/index.php +++ b/main/dropbox/index.php @@ -229,6 +229,57 @@ foreach ($dropbox_categories as $category) { $dropbox_sent_category[]=$category; } } + + +// ACTIONS +if (!$_GET['view'] OR $_GET['view']=='received' OR $dropbox_cnf['sent_received_tabs']==false) { + //echo '

'.get_lang('ReceivedFiles').'

'; + + // This is for the categories + if (isset($_GET['view_received_category']) AND $_GET['view_received_category']<>'') { + $view_dropbox_category_received=$_GET['view_received_category']; + } else { + $view_dropbox_category_received=0; + } + + + /* *** Menu Received *** */ + echo '
'; + if ($view_dropbox_category_received<>0) { + echo get_lang('CurrentlySeeing').': '.$dropbox_categories[$view_dropbox_category_received]['cat_name'].' '; + echo ''.get_lang('Up').''.get_lang('Root')."\n"; + $movelist[0] = 'Root'; // move_received selectbox content + } else { + echo ' '.get_lang('AddNewCategory').''; + } + + echo '
'; +} +if ($_GET['view']=='sent' OR $dropbox_cnf['sent_received_tabs']==false) { + //echo '

'.get_lang('SentFiles').'

'; + + // This is for the categories + if (isset($_GET['view_sent_category']) AND $_GET['view_sent_category']<>'') { + $view_dropbox_category_sent=$_GET['view_sent_category']; + } else { + $view_dropbox_category_sent=0; + } + + /* *** Menu Sent *** */ + echo '
'; + if ($view_dropbox_category_sent<>0) { + echo get_lang('CurrentlySeeing').': '.$dropbox_categories[$view_dropbox_category_sent]['cat_name'].' '; + echo ''.get_lang('Up').''.get_lang('Root')."\n"; + } else { + echo " ".get_lang('AddNewCategory')."\n"; + } + if (empty($_GET['view_sent_category'])) { + echo " ".get_lang('UploadNewFile')." \n"; + } + echo '
'; +} + + /* ----------------------------------------------------------- THE MENU TABS @@ -260,19 +311,6 @@ if (!$_GET['view'] OR $_GET['view']=='received' OR $dropbox_cnf['sent_received_t $view_dropbox_category_received=0; } - - /* *** Menu Received *** */ - echo '
'; - if ($view_dropbox_category_received<>0) { - echo get_lang('CurrentlySeeing').': '.$dropbox_categories[$view_dropbox_category_received]['cat_name'].' '; - echo ''.get_lang('Up').''.get_lang('Root')."\n"; - $movelist[0] = 'Root'; // move_received selectbox content - } else { - echo ' '.get_lang('AddNewCategory').''; - } - - echo '
'; - // object initialisation $dropbox_person = new Dropbox_Person( $_user['user_id'], $is_courseAdmin, $is_courseTutor); // note: are the $is_courseAdmin and $is_courseTutor parameters needed???? @@ -416,20 +454,6 @@ if ($_GET['view']=='sent' OR $dropbox_cnf['sent_received_tabs']==false) { $view_dropbox_category_sent=0; } - /* *** Menu Sent *** */ - echo '
'; - if ($view_dropbox_category_sent<>0) { - echo get_lang('CurrentlySeeing').': '.$dropbox_categories[$view_dropbox_category_sent]['cat_name'].' '; - echo ''.get_lang('Up').''.get_lang('Root')."\n"; - } else { - echo " ".get_lang('AddNewCategory')."\n"; - } - if (empty($_GET['view_sent_category'])) { - echo " ".get_lang('UploadNewFile')." \n"; - } - echo '
'; - //echo '
'; - // object initialisation $dropbox_person = new Dropbox_Person( $_user['user_id'], $is_courseAdmin, $is_courseTutor);