Merge

main/calendar/agenda.inc.php

@@ -2503,7 +2503,7 @@ function show_add_form($id = '') {
 
 
 	// the main area of the agenda item: the wysiwyg editor
-	echo '	<div class="row">
+	echo '	<div><br />	
 				<div class="label">
 					<span class="form_required">*</span>'.get_lang('Description').'
 				</div>
@@ -2549,7 +2549,7 @@ function show_add_form($id = '') {
 			*/
 
 	// File attachment
-	echo '	<div class="row">
+	echo '	<div>
 				<div class="label">					
 				</div>
 				<div class="formw">
@@ -2558,7 +2558,7 @@ function show_add_form($id = '') {
 						<td colspan="2">
 					        <label for="file_name">'.get_lang('AddAnAttachment').'&nbsp;</label>
 					        <input type="file" name="user_upload"/>					        
-					         '.get_lang('FileComment').' <input name="file_comment" type="text" size="20" />
+					         '.get_lang('Comment').' <input name="file_comment" type="text" size="20" />
 					    </td>
 					 </tr>			
 			    </table>

main/css/base.css

@@ -76,10 +76,18 @@ input.maininput:focus {
 .big_icon {
 	/*width:205px; */
 	padding:10px;
+
+	
 }
 
 .big_icon img {
-     margin:0 auto 0 auto;	
+     margin:0 auto 0 auto;
+	 box-shadow: 0 0 5px #C9D2D9;
+	 -moz-border-radius:5px;
+	 -border-radius:5px;
+	 -webkit-border-radius:5px;
+	 border-radius:5px;
+	 
 }
 
 .courseadminview .big_icon a {

main/social/myfiles.php

@@ -106,7 +106,7 @@ echo '<div id="social-content">';
 	echo '<div id="social-content-right>';
 		echo '<a href=""></a>';//TODO: hack and delete this line
 		echo '<br />';								
-        echo '<table><tr><td><iframe name="fileManager" id="fileManager" src="'.api_get_path(WEB_PATH).'main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php?editor=stand_alone" scrolling="no" noresize="noresize" frameborder="no" style="height:450px; width:655px; float:left"></iframe></td></tr></table>';
+        echo '<table><tr><td><iframe name="fileManager" id="fileManager" src="'.api_get_path(WEB_PATH).'main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php?editor=stand_alone" scrolling="no" noresize="noresize" frameborder="no" style="height:450px; width:710px; float:left"></iframe></td></tr></table>';
 	echo '</div>';
 echo '</div>';	
 Display::display_footer();