Merge remote branch 'upstream/master'

8 files changed, 266 insertions, 41 deletions

diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index d783b5123..0230cbc54 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -28,12 +28,10 @@ input, textarea {
 	color: #666;
 	font: 120% Arial, Helvetica, sans-serif;
 	padding: 5px;
-	width: 100%;
-	
+	width: 100%;	
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
-	
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
@@ -237,4 +235,217 @@ input[type="radio"] {
 }
 .user-picker-entry .elgg-button-delete {
 	margin-right:10px;
-}
\ No newline at end of file
+}
+/* ***************************************
+        Datepicker
+**************************************** */
+
+#ui-datepicker-div, .ui-datepicker-inline, .ui-datepicker-calendar{
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	padding: 0;
+	margin: 0;
+	background: #E4ECF5;
+	width: 220px;
+	color: black;
+}
+#ui-datepicker-div {
+	display: none;
+	border: 1px solid #777;
+	z-index: 9999; /*must have*/
+}
+.ui-datepicker-inline {
+	float: left;
+	display: block;
+	border: 0;
+}
+.ui-datepicker-rtl {
+	direction: rtl;
+}
+.ui-datepicker-dialog {
+	padding: 5px !important;
+	border: 4px ridge #ddd !important;
+}
+button.ui-datepicker-trigger {
+	width: 25px;
+}
+img.ui-datepicker-trigger {
+	margin: 2px;
+	vertical-align: middle;
+}
+.ui-datepicker-prompt {
+	float: left;
+	padding: 2px;
+	background: #ddd;
+	color: #000;
+}
+* html .ui-datepicker-prompt {
+	width: 185px;
+}
+.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {
+	clear: both;
+	float: left;
+	width: 218px;
+	color: #fff;
+}
+.ui-datepicker-control {
+	background: #400;
+	padding: 2px 0px;
+}
+.ui-datepicker-links {
+	background: #000;
+	padding: 2px 0px;
+}
+.ui-datepicker-control, .ui-datepicker-links {
+	font-weight: bold;
+	font-size: 80%;
+}
+.ui-datepicker-links label { /* disabled links */
+	padding: 2px 5px;
+	color: #888;
+}
+.ui-datepicker-clear, .ui-datepicker-prev {
+	float: left;
+}
+.ui-datepicker-rtl .ui-datepicker-clear, .ui-datepicker-rtl .ui-datepicker-prev {
+	float: right;
+	text-align: right;
+}
+.ui-datepicker-current {
+	float: left;
+	width: 30%;
+	text-align: center;
+}
+.ui-datepicker-close, .ui-datepicker-next {
+	float: right;
+	text-align: right;
+	padding: 0px 0px 2px 0px;
+}
+.ui-datepicker-rtl .ui-datepicker-close, .ui-datepicker-rtl {
+	float: left;
+	text-align: left;
+}
+.ui-datepicker-header {
+	padding: 1px 0 3px;
+	background: #4690D6;
+	text-align: center;
+	font-weight: bold;
+	height: 1.3em;
+	padding: 0 2px 3px 0;
+}
+.ui-datepicker-header select {
+	background: #333;
+	color: #fff;
+	border: 0px;
+	font-weight: bold;
+}
+.ui-datepicker {
+	background: #ccc;
+	text-align: center;
+	font-size: 100%;
+}
+.ui-datepicker a {
+	display: block;
+	width: 30px;
+}
+.ui-datepicker-title-row {
+	background: #777;
+}
+.ui-datepicker-days-row {
+	background: #eee;
+	color: #666;
+}
+.ui-datepicker-week-col {
+	background: #777;
+	color: #fff;
+}
+.ui-datepicker-days-cell {
+	color: #000;
+	border: 1px solid #ddd;
+}
+.ui-datepicker-days-cell a{
+	display: block;
+}
+.ui-datepicker-week-end-cell {
+	background: #ddd;
+}
+.ui-datepicker-title-row .ui-datepicker-week-end-cell {
+	background: #777;
+}
+.ui-datepicker-days-cell-over {
+	background: #fff;
+	border: 1px solid #777;
+}
+.ui-datepicker-unselectable {
+	color: #E4ECF5;
+}
+.ui-datepicker-today {
+	background: #4690D6 !important;
+}
+.ui-datepicker-current-day {
+	background: #999 !important;
+}
+.ui-datepicker-status {
+	background: #ddd;
+	width: 100%;
+	font-size: 80%;
+	text-align: center;
+}
+        
+/* ________ Datepicker Links _______
+        
+** Reset link properties and then override them with !important */
+#ui-datepicker-div a, .ui-datepicker-inline a {
+	cursor: pointer;
+	margin: 0;
+	padding: 0;
+	background: none;
+	color: #000;
+	align: center !important;
+}
+.ui-datepicker-inline .ui-datepicker-links a {
+	padding: 0 5px !important;
+}
+.ui-datepicker-control a, .ui-datepicker-links a {
+	padding: 2px 5px !important;
+	color: #eee !important;
+}
+.ui-datepicker-title-row a {
+	color: #eee !important;
+}
+.ui-datepicker-control a:hover {
+	background: #fdd !important;
+	color: #333 !important;
+}
+.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover {
+	background: #ddd !important;
+	color: #333 !important;
+}
+        
+/* ___________ MULTIPLE MONTHS _________*/
+        
+.ui-datepicker-multi .ui-datepicker {
+	border: 1px solid #777;
+}
+.ui-datepicker-one-month {
+	float: left;
+	width: 185px;
+}
+.ui-datepicker-new-row {
+	clear: left;
+}
+        
+/* ___________ IE6 IFRAME FIX ________ */
+        
+.ui-datepicker-cover {
+	display: none; /*sorry for IE5*/
+	display/**/: block; /*sorry for IE5*/
+	position: absolute; /*must have*/
+	z-index: -1; /*must have*/
+	filter: mask(); /*must have*/
+	top: -4px; /*must have*/
+	left: -4px; /*must have*/
+	width: 200px; /*must have*/
+	height: 200px; /*must have*/
+}
+
diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index a50f85c8c..f080a29b2 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -34,9 +34,6 @@ p:last-child {
 	margin-bottom: 0;
 }
 
-dt { font-weight: bold }
-dd { margin: 0 0 1em 1em }
-
 pre, code {
 	font-family: Monaco, "Courier New", Courier, monospace;
 	font-size: 12px;
@@ -138,6 +135,10 @@ h6 { font-size: 0.8em; }
 .elgg-output {
 	margin-top: 10px;
 }
+
+.elgg-output dt { font-weight: bold }
+.elgg-output dd { margin: 0 0 1em 1em }
+
 .elgg-output ul, ol {
 	margin: 0 1.5em 1.5em 0;
 	padding-left: 1.5em;
diff --git a/views/default/forms/profile/fields/add.php b/views/default/forms/profile/fields/add.php
index c700cf7f5..7961037e6 100644
--- a/views/default/forms/profile/fields/add.php
+++ b/views/default/forms/profile/fields/add.php
@@ -9,7 +9,7 @@ $label_text = elgg_echo('profile:label');
 $type_text = elgg_echo('profile:type');
 
 $label_control = elgg_view('input/text', array('name' => 'label'));
-$type_control = elgg_view('input/pulldown', array('name' => 'type', 'options_values' => array(
+$type_control = elgg_view('input/dropdown', array('name' => 'type', 'options_values' => array(
 	'text' => elgg_echo('text'),
 	'longtext' => elgg_echo('longtext'),
 	'tags' => elgg_echo('tags'),
diff --git a/views/default/input/autocomplete.php b/views/default/input/autocomplete.php
index b16d08fc3..0a4057ddf 100644
--- a/views/default/input/autocomplete.php
+++ b/views/default/input/autocomplete.php
@@ -35,7 +35,7 @@ elgg_load_js('elgg.autocomplete');
 
 <script type="text/javascript">
 elgg.provide('elgg.autocomplete');
-elgg.autocomplete.url = "<?php elgg_get_site_url() . 'livesearch?' . $ac_url_params; ?>";
+elgg.autocomplete.url = "<?php echo elgg_get_site_url() . 'livesearch?' . $ac_url_params; ?>";
 </script> 
 <input type="text" <?php echo elgg_format_attributes($vars); ?> />
 
diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php
index 893bbd205..55ddc2fe4 100644
--- a/views/default/navigation/menu/elements/item.php
+++ b/views/default/navigation/menu/elements/item.php
@@ -21,8 +21,11 @@ if ($children) {
 }
 
 $item_class = $item->getItemClass();
+
+//allow people to specify name with underscores
+$name = str_replace('_', '-', $item->getName());
 if ($item_class) {
-	$class = "class=\"$item_class\"";
+	$class = "class=\"elgg-menu-item-$name $item_class\"";
 }
 
 echo "<li $class>";
diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index 4b5a3ba48..a346d4ff1 100644
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -150,6 +150,24 @@ $website = elgg_view('output/url', array(
 $copyright = elgg_view('output/text', array('value' => $plugin->manifest->getCopyright()));
 $license = elgg_view('output/text', array('value' => $plugin->manifest->getLicense()));
 
+// show links to text files
+$files = $plugin->getAvailableTextFiles();
+
+$docs = '';
+if ($files) {
+	$docs = '<ul>';
+	foreach ($files as $file => $path) {
+		$url = 'admin_plugin_text_file/' . $plugin->getID() . "/$file";
+		$link = elgg_view('output/url', array(
+			'text' => $file,
+			'href' => $url
+		));
+		$docs .= "<li>$link</li>";
+
+	}
+	$docs .= '</ul>';
+}
+
 ?>
 
 <div class="elgg-state-draggable elgg-plugin <?php echo $active_class ?>" id="elgg-plugin-<?php echo $plugin->guid; ?>">
@@ -190,6 +208,7 @@ if (elgg_view_exists($settings_view)) {
 	
 			<div class="plugin_description"><?php echo $description; ?></div>
 			<p class="plugin_author"><?php echo $author . ' - ' . $website; ?></p>
+			<?php echo $docs; ?>
 	
 			<div class="pts">
 			<?php 
diff --git a/views/default/object/plugin/simple.php b/views/default/object/plugin/simple.php
index 0361666ff..d57d81934 100644
--- a/views/default/object/plugin/simple.php
+++ b/views/default/object/plugin/simple.php
@@ -42,6 +42,19 @@ if ($website) {
 	$plugin_footer .= "<li><a href=\"$website\">" . elgg_echo('admin:plugins:plugin_website') . '</a></li>';
 }
 
+// show links to text files
+$files = $plugin->getAvailableTextFiles();
+
+foreach ($files as $file => $path) {
+	$url = 'admin_plugin_text_file/' . $plugin->getID() . "/$file";
+	$link = elgg_view('output/url', array(
+		'text' => $file,
+		'href' => $url
+	));
+	$plugin_footer .= "<li>$link</li>";
+
+}
+
 if (elgg_view_exists("settings/$plugin_id/edit")) {
 	$settings_href = elgg_get_site_url() . "admin/plugin_settings/$plugin_id";
 	$plugin_footer .= "<li><a class='plugin_settings link' href='$settings_href'>" . elgg_echo('settings') . "</a></li>";
diff --git a/views/default/page/components/gallery.php b/views/default/page/components/gallery.php
index 1ba896836..e86b9f885 100644
--- a/views/default/page/components/gallery.php
+++ b/views/default/page/components/gallery.php
@@ -3,8 +3,6 @@
  * Gallery view
  *
  * @uses $vars['items']
- *
- * @todo not complete - number of columns
  */
 
 $items = $vars['items'];
@@ -21,8 +19,6 @@ $pagination = elgg_extract('pagination', $vars, true);
 $offset_key = elgg_extract('offset_key', $vars, 'offset');
 $position = elgg_extract('position', $vars, 'after');
 
-$num_columns = 4;
-
 if ($pagination && $count) {
 	$nav .= elgg_view('navigation/pagination', array(
 		'offset' => $offset,
@@ -37,33 +33,15 @@ if ($position == 'before' || $position == 'both') {
 }
 
 ?>
-<table class="elgg-gallery">
-<?php
-
-$col = 0;
-foreach ($items as $item) {
-	if ($col == 0) {
-		echo '<tr>';
-	}
-	$col++;
-
-	echo '<td>';
-	echo elgg_view_list_item($item, $vars);
-	echo "</td>";
-
-	if ($col == $num_columns) {
-		echo '</tr>';
-		$col = 0;
-	}
-}
-
-if ($col > 0) {
-	echo '</tr>';
-}
-
-?>
-
-</table>
+<ul class="elgg-gallery">
+	<?php
+		foreach ($items as $item) {
+			echo '<li>';
+			echo elgg_view_list_item($item, $vars);
+			echo "</li>";
+		}
+	?>
+</ul>
 
 <?php
 if ($position == 'after' || $position == 'both') {