added a latest photos widget

9 files changed, 84 insertions, 37 deletions

diff --git a/languages/de.php b/languages/de.php
index 3c6d3d101..bca483af1 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -123,11 +123,13 @@
 

 		//widgets

 

-			'album:widget' => "Fotoalben",

+			'tidypics:widget:albums' => "Fotoalben",

+			'tidypics:widget:album_descr' => "Zeige Deine neuesten Fotoalben",

+			'tidypics:widget:num_albums' => "Anzahl der anzuzeigenden Alben",

+			'tidypics:widget:latest' => "Latest Photos",

+			'tidypics:widget:latest_descr' => "Display your latest photos",

+			'tidypics:widget:num_latest' => "Number of images to display",

 			'album:more' => "Alle Alben ansehen",

-			'album:widget:description' => "Zeige Deine neuesten Fotoalben",

-			'album:display:number' => "Anzahl der Alben, die angezeigt werden sollen",

-			'album:num_albums' => "Anzahl der anzuzeigenden Alben",

 

 		//river

 

diff --git a/languages/en.php b/languages/en.php
index 7aef34094..c6d9bd61b 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -119,11 +119,13 @@
 

 		//widgets

 

-			'album:widget' => "Photo Albums",

+			'tidypics:widget:albums' => "Photo Albums",

+			'tidypics:widget:album_descr' => "Showcase your photo albums",

+			'tidypics:widget:num_albums' => "Number of albums to display",

+			'tidypics:widget:latest' => "Latest Photos",

+			'tidypics:widget:latest_descr' => "Display your latest photos",

+			'tidypics:widget:num_latest' => "Number of images to display",

 			'album:more' => "View all albums",

-			'album:widget:description' => "Showcase your latest photo albums",

-			'album:display:number' => "Number of albums to display",

-			'album:num_albums' => "Number of albums to display",

 

 		//  river

 

diff --git a/languages/es.php b/languages/es.php
index 2e0d1cf81..1c9b580ef 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -118,11 +118,13 @@
 

 		//widgets

 

-			'album:widget' => "Álbumnes de fotos",

+			'tidypics:widget:albums' => "Álbumnes de fotos",

+			'tidypics:widget:album_descr' => "Mosrar tu último álbum de fotos",

+			'tidypics:widget:num_albums' => "Número de álbumnes a mostrar",

+			'tidypics:widget:latest' => "Latest Photos",

+			'tidypics:widget:latest_descr' => "Display your latest photos",

+			'tidypics:widget:num_latest' => "Number of images to display",

 			'album:more' => "Ver todos los álbumnes",

-			'album:widget:description' => "Mosrar tu último álbum de fotos",

-			'album:display:number' => "Número de álbumnes a mostrar",

-			'album:num_albums' => "Número de álbumnes a mostrar",

 

 		//  river

 

diff --git a/languages/he.php b/languages/he.php
index 801d8a96f..8edee9c0c 100644
--- a/languages/he.php
+++ b/languages/he.php
@@ -95,11 +95,13 @@ $hebrew = array(
 	 'tidypics:phototagging:error'  =>  "אירע שגיאה בתהליך התיוג" , 
 	 'tidypics:deletetag:success'  =>  "התגים נמחקו בהצלחה" , 
 	 'tidypics:posted'  =>  "הוסיף/ה תמונה" , 
-	 'album:widget'  =>  "אלבומי תמונות" , 
+	 'tidypics:widget:albums'  =>  "אלבומי תמונות" , 
+	 'tidypics:widget:album_descr'  =>  "הצג את האלבומים החדשים שלך" , 
+	 'tidypics:widget:num_albums'  =>  "מספר האלבומים לתצוגה" , 
+	 'tidypics:widget:latest' => "Latest Photos",
+	 'tidypics:widget:latest_descr' => "Display your latest photos",
+	 'tidypics:widget:num_latest' => "Number of images to display",
 	 'album:more'  =>  "צפיה בכל האלבומים" , 
-	 'album:widget:description'  =>  "הצג את האלבומים החדשים שלך" , 
-	 'album:display:number'  =>  "מספר האלבומים לתצוגה" , 
-	 'album:num_albums'  =>  "מספר האלבומים לתצוגה" , 
 	 'image:river:created'  =>  "%s הוסיף/ה את התמונה %s לאלבום %s" , 
 	 'image:river:item'  =>  "תמונה" , 
 	 'image:river:annotate'  =>  "תגובה לתמונה" , 
diff --git a/start.php b/start.php
index 9e061ad90..d88f7497a 100644
--- a/start.php
+++ b/start.php
@@ -41,9 +41,10 @@
 		

 		// Register a page handler, so we can have nice URLs

 		register_page_handler('photos','tidypics_page_handler');

-			

+		

 		// Add a new tidypics widget

-		add_widget_type('album_view', elgg_echo("album:widget"), elgg_echo("album:widget:description"), 'profile');

+		add_widget_type('album_view', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:album_descr"), 'profile');

+		add_widget_type('latest', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile');

 		

 		// Register a URL handler for files

 		register_entity_url_handler('tidypics_image_url', 'object', 'image');

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 84f6ee2d5..c3c202caf 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -113,6 +113,11 @@ text-align:center;
 color:#333333;
 }
 
+.tidypics_widget_latest {
+margin: 0 auto;
+width: 208px;
+}
+
 /* ---------  image upload/edit forms  ------------   */
 
 #tidpics_image_upload_list li {
diff --git a/views/default/widgets/album_view/edit.php b/views/default/widgets/album_view/edit.php
index 2d7c7708f..1fea6764a 100644
--- a/views/default/widgets/album_view/edit.php
+++ b/views/default/widgets/album_view/edit.php
@@ -1,21 +1,24 @@
 <p>

-		<?php echo elgg_echo("album:num_albums"); ?>:

-		

-		<?php

-			if($vars['entity']->num_display == '') $vars['entity']->num_display = 5;

-		?>

-		<select name="params[num_display]">

-		    <option value="1" <?php if($vars['entity']->num_display == 1) echo "SELECTED"; ?>>1</option>

-		    <option value="2" <?php if($vars['entity']->num_display == 2) echo "SELECTED"; ?>>2</option>

-		    <option value="3" <?php if($vars['entity']->num_display == 3) echo "SELECTED"; ?>>3</option>

-		    <option value="4" <?php if($vars['entity']->num_display == 4) echo "SELECTED"; ?>>4</option>

-		    <option value="5" <?php if($vars['entity']->num_display == 5) echo "SELECTED"; ?>>5</option>

-		    <option value="6" <?php if($vars['entity']->num_display == 6) echo "SELECTED"; ?>>6</option>

-		    <option value="7" <?php if($vars['entity']->num_display == 7) echo "SELECTED"; ?>>7</option>

-		    <option value="8" <?php if($vars['entity']->num_display == 8) echo "SELECTED"; ?>>8</option>

-		    <option value="9" <?php if($vars['entity']->num_display == 9) echo "SELECTED"; ?>>9</option>

-		    <option value="10" <?php if($vars['entity']->num_display == 10) echo "SELECTED"; ?>>10</option>

-		    <option value="15" <?php if($vars['entity']->num_display == 15) echo "SELECTED"; ?>>15</option>

-		    <option value="20" <?php if($vars['entity']->num_display == 20) echo "SELECTED"; ?>>20</option>

-		</select>

+<?php 

+

+	echo elgg_echo("tidypics:widget:num_albums") . ": ";

+	

+	

+	if($vars['entity']->num_display == '') $vars['entity']->num_display = 5;

+	

+?>

+	<select name="params[num_display]">

+		<option value="1" <?php if($vars['entity']->num_display == 1) echo "SELECTED"; ?>>1</option>

+		<option value="2" <?php if($vars['entity']->num_display == 2) echo "SELECTED"; ?>>2</option>

+		<option value="3" <?php if($vars['entity']->num_display == 3) echo "SELECTED"; ?>>3</option>

+		<option value="4" <?php if($vars['entity']->num_display == 4) echo "SELECTED"; ?>>4</option>

+		<option value="5" <?php if($vars['entity']->num_display == 5) echo "SELECTED"; ?>>5</option>

+		<option value="6" <?php if($vars['entity']->num_display == 6) echo "SELECTED"; ?>>6</option>

+		<option value="7" <?php if($vars['entity']->num_display == 7) echo "SELECTED"; ?>>7</option>

+		<option value="8" <?php if($vars['entity']->num_display == 8) echo "SELECTED"; ?>>8</option>

+		<option value="9" <?php if($vars['entity']->num_display == 9) echo "SELECTED"; ?>>9</option>

+		<option value="10" <?php if($vars['entity']->num_display == 10) echo "SELECTED"; ?>>10</option>

+		<option value="15" <?php if($vars['entity']->num_display == 15) echo "SELECTED"; ?>>15</option>

+		<option value="20" <?php if($vars['entity']->num_display == 20) echo "SELECTED"; ?>>20</option>

+	</select>

 </p>
\ No newline at end of file
diff --git a/views/default/widgets/latest/edit.php b/views/default/widgets/latest/edit.php
new file mode 100644
index 000000000..15a56af82
--- /dev/null
+++ b/views/default/widgets/latest/edit.php
@@ -0,0 +1,15 @@
+<p>

+<?php 

+	echo elgg_echo("tidypics:widget:num_latest") . ": ";

+

+	if($vars['entity']->num_display == '') $vars['entity']->num_display = 6;

+	

+?>

+	<select name="params[num_display]">

+		<option value="6" <?php if($vars['entity']->num_display == 6) echo "SELECTED"; ?>>6</option>

+		<option value="9" <?php if($vars['entity']->num_display == 9) echo "SELECTED"; ?>>9</option>

+		<option value="12" <?php if($vars['entity']->num_display == 12) echo "SELECTED"; ?>>12</option>

+		<option value="15" <?php if($vars['entity']->num_display == 15) echo "SELECTED"; ?>>15</option>

+		<option value="18" <?php if($vars['entity']->num_display == 18) echo "SELECTED"; ?>>18</option>

+	</select>

+</p>
\ No newline at end of file
diff --git a/views/default/widgets/latest/view.php b/views/default/widgets/latest/view.php
new file mode 100644
index 000000000..6d65e9dc1
--- /dev/null
+++ b/views/default/widgets/latest/view.php
@@ -0,0 +1,15 @@
+<div class="contentWrapper"> 
+<?php
+
+	//the number of files to display
+	$number = (int) $vars['entity']->num_display;
+	//if no number has been set, default to 6
+	if (!$number)
+		$number = 6;
+
+	echo '<div class="tidypics_widget_latest">';
+	echo tp_get_latest_photos($number);
+	echo '</div>';
+
+?>
+</div>
\ No newline at end of file