Explorar el Código

[svn r16725] first part of css cleanup (currently only the css/corporate style)

Patrick Cool hace 16 años
padre
commit
f12bcfbfc4

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 530 - 709
main/css/corporate/default.css


+ 3 - 3
main/document/create_document.php

@@ -1,5 +1,5 @@
-<?php
-// $Id: create_document.php 16639 2008-10-29 08:39:49Z elixir_inter $
+<?php // $Id: create_document.php 16725 2008-11-12 15:43:21Z pcool $
+
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -352,7 +352,7 @@ $form->add_html_editor('content','', false, false);
 // Comment-field
 
 //$form->addElement('textarea', 'comment', get_lang('Comment'), array ('rows' => 5, 'cols' => 50));
-$form->addElement('submit', 'submit', get_lang('SaveDocument'));
+$form->addElement('submit', 'submit', get_lang('CreateTheDocument'));
 $form->setDefaults($default);
 
 // HTML

+ 2 - 10
main/document/document.inc.php

@@ -1,4 +1,5 @@
-<?php // $Id: document.inc.php 15716 2008-07-02 23:10:47Z juliomontoya $
+<?php // $Id: document.inc.php 16725 2008-11-12 15:43:21Z pcool $
+
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -122,15 +123,6 @@ function build_directory_selector($folders,$curdirpath,$group_dir='',$changeRend
 	return $form;
 }
 
-
-function display_document_options()
-{
-	$message = "<a href=\"quota.php?".api_get_cidreq()."\">".get_lang("ShowCourseQuotaUse")."</a>";
-	echo 	/*"<div id=\"smallmessagebox\">"
-			.*/ "<p>" . $message . "</p>"
-			/*. "</div>"*/;
-}
-
 /**
  * Create a html hyperlink depending on if it's a folder or a file
  *

+ 9 - 23
main/document/document.php

@@ -1,4 +1,4 @@
-<?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
+<?php // $Id: document.php 16725 2008-11-12 15:43:21Z pcool $
  
 /*
 ==============================================================================
@@ -319,11 +319,11 @@ if($to_group_id !=0) //add group name after for group documents
 
 if(!empty($_SESSION['_gid']))
 {
-	Display::display_introduction_section(TOOL_DOCUMENT.$_SESSION['_gid']);
+	Display::display_introduction_section(TOOL_DOCUMENT.$_SESSION['_gid'],'left');
 }
 else
 {
-	Display::display_introduction_section(TOOL_DOCUMENT);
+	Display::display_introduction_section(TOOL_DOCUMENT,'left');
 }
 
 /*============================================================================*/
@@ -605,18 +605,17 @@ $docs_and_folders = DocumentManager::get_all_document_data($_course,$curdirpath,
 
 ?>
 
-<div id="folderselector" style="float:left;margin-right:10px;margin-top:5px;">
 <?php
 $folders = DocumentManager::get_all_document_folders($_course,$to_group_id,$is_allowed_to_edit || $group_member_with_upload_rights);
 if($folders===false)
 {
 	$folders = array();
 }
-echo(build_directory_selector($folders,$curdirpath,(isset($group_properties['directory'])?$group_properties['directory']:array()),true));
+
 ?>
-</div>
+
 	<?php
-	echo '<div id="doc_links">';
+	echo '<div class="actions">';
 
 
 	/* GO TO PARENT DIRECTORY */
@@ -643,6 +642,7 @@ echo(build_directory_selector($folders,$curdirpath,(isset($group_properties['dir
 			<!-- create directory -->
 			<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl.$req_gid; ?>&amp;createdir=1"><img src="../img/folder_new.gif" border="0" alt ="" /></a>
 			<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl.$req_gid; ?>&amp;createdir=1"><?php echo get_lang("CreateDir"); ?></a>&nbsp;
+			<a href="quota.php?<?php echo api_get_cidreq();?>"><?php Display::display_icon('statistics.gif'); ?><?php echo get_lang("ShowCourseQuotaUse"); ?></a>
 		<?php
 	}
 	?>
@@ -657,7 +657,7 @@ echo(build_directory_selector($folders,$curdirpath,(isset($group_properties['dir
 		echo "<a href=\"slideshow.php?".api_get_cidreq()."&curdirpath=".$curdirpathurl."\"><img src=\"../img/images_gallery.gif\" border=\"0\" title=\"".get_lang('ViewSlideshow')."\"/>&nbsp;". get_lang('ViewSlideshow') . "</a>";
 	}
 	echo "</div>";
-
+	echo(build_directory_selector($folders,$curdirpath,(isset($group_properties['directory'])?$group_properties['directory']:array()),true));
 //==============================================================================
 
 if(isset($docs_and_folders) && is_array($docs_and_folders))
@@ -682,7 +682,6 @@ if(isset($docs_and_folders) && is_array($docs_and_folders))
 		$invisibility_span_close = ($id['visibility']==0)?'</span>':'';
 		//size (or total size of a directory)		
 		$size = $id['filetype']=='folder' ? get_total_folder_size($id['path'],$is_allowed_to_edit) : $id['size'];
-		
 		//get the title or the basename depending on what we're using
 		if ($use_document_title=='true' AND $id['title']<>'')
 		{
@@ -834,19 +833,6 @@ if(!empty($table_footer))
 	echo $table_footer;
 }
 
-/*
-==============================================================================
-		Quota section
-
-		Proposal: perhaps move/add the quota display to another section, e.g. course info
-==============================================================================
-*/
-if ($is_allowed_to_edit) display_document_options();
-
-/*
-==============================================================================
-		Footer
-==============================================================================
-*/
+// footer
 Display::display_footer();
 ?>

+ 44 - 66
main/document/slideshow.php

@@ -1,5 +1,5 @@
-<?php
-// $Id: slideshow.php 11766 2007-03-29 08:39:27Z elixir_julian $
+<?php // $Id: slideshow.php 16725 2008-11-12 15:43:21Z pcool $
+
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -122,81 +122,59 @@ function MM_openBrWindow(theURL,winName,features) { //v2.0
 </script>
 
 
-<p></p>
-<h3 style="margin-top: 0; margin-bottom: 0"><?php echo get_lang('SlideShow'); ?></h3>
-<table width="100%" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td>
+<div class="actions">
 	<?php
+	// previous slide
+	if ($slide > 0)
+	{
+		echo '<a href="slideshow.php?slide_id='.$previous_slide.'&amp;curdirpath='.$pathurl.'">';
+	}
+	echo '&lt;&lt;'.get_lang('_previous_slide');
+	if ($slide > 0)
+	{
+		echo "</a> ";
+	}
 
-if ($slide > 0)
-{
-	echo "<a href='slideshow.php?slide_id=".$previous_slide."&curdirpath=$pathurl'>";
-}
-?>
-	<strong>&lt;&lt; <?php echo get_lang('_previous_slide'); ?></strong>	<?php
-
-if ($slide > 0)
-{
-	echo "</a>";
-}
-?>
-	&nbsp;|&nbsp;
-	<?php
+	// divider
+	echo '&nbsp;|&nbsp;';
 
-if ($slide < $total_slides -1 and $slide_id <> "all")
-{
+	// next slide
+	if ($slide < $total_slides -1 and $slide_id <> "all")
+	{
 	echo "<a href='slideshow.php?slide_id=".$next_slide."&curdirpath=$pathurl'>";
-}
-?>
-	<strong><?php echo get_lang('_next_slide'); ?> &gt;&gt;</strong>
-	<?php
+	}
+	echo get_lang('_next_slide').'&gt;&gt;';
+	if ($slide > 0)
+	{
+		echo "</a> ";
+	}
 
-if ($slide > 0)
-{
-	echo "</a>";
-}
-?>
-	</td>
-    <td>
-	<?php
+	// exit the slideshow
+	echo '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.get_lang('_exit_slideshow').'</a> ';
 
-if ($slide_id <> "all")
-{
-	echo get_lang('_image')." ".$next_slide." ".get_lang('_of')." ".$total_slides;
-}
+	// show thumbnails
+	if ($slide_id <> "all")
+	{
+		echo "<a href='slideshow.php?slide_id=all&curdirpath=".$pathurl."'>".get_lang('_show_thumbnails')."</a> ";
+	}
+	else 
+	{
+		echo get_lang('_show_thumbnails').' '; 
+	}
+
+	$image = $sys_course_path.$_course['path']."/document/".$folder.$image_files_only[$slide];
+	
+	// slideshow options
+	echo '<a href="slideshowoptions.php?curdirpath='.$pathurl.'">'.get_lang('_set_slideshow_options').'</a> ';
 ?>
-	</td>
-    <td align="right"><a href="document.php?action=exit_slideshow&curdirpath=<?php echo $pathurl;?>"><?php echo get_lang('_exit_slideshow');?></a> </td>
-  </tr>
-  <tr>
-    <td>
-		<?php
+</div>
 
+<?php
 if ($slide_id <> "all")
 {
-	echo "<a href='slideshow.php?slide_id=all&curdirpath=".$pathurl."'>".get_lang('_show_thumbnails')."</a>";
-}
-else
-{
-	echo get_lang('_click_thumbnails');
+	echo get_lang('_image')." ".$next_slide." ".get_lang('_of')." ".$total_slides;
 }
-$image = $sys_course_path.$_course['path']."/document/".$folder.$image_files_only[$slide];
-
-// EXIF DATA, remove "and 0==1" in the if statement if you want to display the EXIT data in a popup
-//if (exif_read_data($image))
-//	{ 
-//	$_SESSION["exif_image"]=$image; 
-//
-// 	echo "| <a href='#'  onClick='MM_openBrWindow('exifinfo.php?image=".$slide."&amp;path=".$path."','exifinfo','scrollbars=yes,resizable=yes,width=500,height=400')'>Show Exif metadata</a>";
-//	}
-?>
-	</td>
-    <td><?php echo htmlspecialchars($image_files_only[$slide]) ?></td>
-    <td align="right"><a href="slideshowoptions.php?curdirpath=<?php echo $pathurl; ?>"><?php echo get_lang('_set_slideshow_options');?></a></td>
-  </tr>
-</table>
-<?php
+echo '<br />'.htmlspecialchars($image_files_only[$slide]);
 
 // =======================================================================
 //				TREATING THE POST DATA FROM SLIDESHOW OPTIONS

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio