Merge remote branch 'gallery3-contrib/master'

3.0/modules/themeroller/views/admin_screen-rtl.css.php

@@ -1,5 +1,5 @@
 /**
- * Gallery 3 Admin Right yo left language styles
+ * Gallery 3 Admin Right to left language styles
  */
 
 .rtl {
@@ -82,7 +82,11 @@
   padding-right: 0;
 }
 
- input.checkbox {
+input.checkbox,
+input[type="checkbox"],
+input.radio,
+input[type="radio"] {
+  margin-right: 0;
   margin-left: .4em;
 }
 
@@ -99,6 +103,14 @@
   margin-right: .2em;
 }
 
+.g-group h4 {
+  padding: .5em .5em .5em 0;
+}
+
+.g-group .g-user {
+  padding: .2em .5em 0 0;
+}
+
 /* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
 .g-buttonset .ui-corner-tl {
 	-moz-border-radius-topleft: 0;
@@ -260,6 +272,10 @@
   right: auto;
 }
 
+.ui-tabs .ui-tabs-nav li {
+  float: right;
+}
+
 #g-content #g-album-grid .g-item,
 #g-site-theme,
 #g-admin-theme,
@@ -297,3 +313,63 @@
   margin: 0 0 1em 1em;
 }
 
+.g-button {
+  margin: 0 0 0 4px;
+}
+
+/* RTL paginator ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-paginator .g-info {
+  width: 35%;
+}
+
+.g-paginator .g-text-right {
+  margin-left: 0;
+}
+
+.g-paginator .ui-icon-seek-end {
+  background-position: -80px -160px;
+}
+
+.g-paginator .ui-icon-seek-next {
+  background-position: -48px -160px;
+}
+
+.g-paginator .ui-icon-seek-prev {
+  background-position: -32px -160px;
+}
+
+.g-paginator .ui-icon-seek-first {
+  background-position: -64px -160px;
+}
+
+#g-header #g-login-menu,
+#g-header #g-quick-search-form {
+  clear: left;
+  float: left;
+}
+
+#g-header #g-login-menu li {
+  margin-left: 0;
+  padding-left: 0;
+  padding-right: 1.2em;
+}
+
+#g-site-menu {
+  left: auto;
+  right: 240px;
+}
+
+#g-view-menu #g-slideshow-link {
+  background-image: url('../images/ico-view-slideshow-rtl.png');
+}
+
+#g-sidebar .g-block-content {
+  padding-right: 1em;
+  padding-left: 0;
+}
+
+#g-footer #g-credits li {
+  padding-left: 1.2em !important;
+  padding-right: 0;
+}

3.0/themes/pear4gallery3/theme.info

@@ -1,6 +1,6 @@
 name = ".Pear Theme"
 description = "A theme with the intention to mimic Apples mobile me gallery."
-version = 2.2
+version = 2.3
 author = "Fredrik Erlandsson <fredrik.e@gmail.com>"
 site = 1
 admin = 0

3.0/themes/pear4gallery3/views/album.html.php

@@ -53,7 +53,7 @@ if($child->is_album()):
 endforeach; 
 endif; 
 // End skimming // ?>
-	<p class="giTitle <? if(!$child->is_album()) print 'center';?>"><?= html::purify($child->title) ?> </p>
+	<p class="giTitle <? if(!$child->is_album()) print 'center';?>"><?= html::purify(text::limit_chars($child->title, 20)) ?> </p>
 	<? if($child->is_album()): ?><div class="giInfo"><?= count($granchildren)?> photos</div><? endif ?>
 </div>
    <?/* <?= $theme->thumb_bottom($child) ?>

3.1/modules/ecard/controllers/ecard.php

@@ -40,8 +40,6 @@ class Ecard_Controller extends Controller {
 		}
 
 		if ($valid) {
-	  $to_array = explode(",",$form->send_ecard->inputs["to_email"]->value);
-	  foreach($to_array as $to) {
 			$v = new View("ecard_email.html");
 			$v->item = $item;
 			$v->subject = module::get_var("ecard", "subject");
@@ -54,7 +52,7 @@ class Ecard_Controller extends Controller {
 			$v->custom_message = $form->send_ecard->text->value;
 			$v->image = $item->name;
 			$from = $form->send_ecard->inputs["from_email"]->value;
-		  $headers = array("from" => $from_name."<".$from.">", "to" => $to, "subject" => module::get_var("ecard", "subject"));
+
 			require_once(MODPATH. "ecard/lib/mime.php");
 			$mime = new Mail_mime("\n");
 			$mime->setHTMLBody($v->render());
@@ -77,10 +75,14 @@ class Ecard_Controller extends Controller {
 				}
 			}
 			$body = $mime->get(array('html_charset'  => 'UTF-8', 'text_charset'  => 'UTF-8','text_encoding' => '8bit','head_charset'  => 'UTF-8'));
+
+			$to_array = explode(",",$form->send_ecard->inputs["to_email"]->value);
+			foreach($to_array as $to) {
+				$headers = array("from" => $from_name."<".$from.">", "to" => trim($to), "subject" => module::get_var("ecard", "subject"));
 				self::_notify($headers['to'], $headers['from'], $headers['subject'], $item, $body, $mime->headers(), $bcc, $cc);
 			}
 			unlink($tmpfile);
-	  message::success("eCard successfully sent");
+			message::success("eCard successfully sent to ".$form->send_ecard->inputs["to_email"]->value);
 			json::reply(array("result" => "success"));
 		} else {
 			json::reply(array("result" => "error", "html" => (string) $form));