Empty commit

classes/notificationsmanager.class.php

@@ -333,7 +333,7 @@ public function load_staff_pms() {
 		}
 
 		if ($NewStaffPMs > 0) {
-			$Title = 'You have new ' . ($NewStaffPMs == 1 ? 'a' : $NewStaffPMs) . ' Staff PM' . ($NewStaffPMs > 1 ? 's' : '');
+			$Title = 'You have ' . ($NewStaffPMs == 1 ? 'a' : $NewStaffPMs) . ' new Staff PM' . ($NewStaffPMs > 1 ? 's' : '');
 			$this->create_notification(self::STAFFPM, 0, $Title, 'staffpm.php', self::INFO);
 		}
 	}

docs/CHANGES.txt

@@ -1,5 +1,14 @@
 CHANGE LOG
 
+2014-01-18 by alderaan
+Fix grammar in pop-up notifications about new Staff PMs.
+
+2014-01-18 by flaming
+Rename "Unrelated Ebooks" torrent report type to "Ebook Collection".
+
+2014-01-18 by alderaan
+Rename the "Dismiss" button to "Hide" for pop-up notifications.
+
 2014-01-05 by Ajax
 Wildcard searches in IP history
 

sections/reportsv2/array.php

@@ -818,7 +818,7 @@
 			'unrelated' => array(
 				'priority' => '270',
 				'reason' => '-1',
-				'title' => 'Unrelated Ebooks',
+				'title' => 'Ebook Collection',
 				'report_messages' => array(
 					'Please include as much information as possible to verify the report.'
 				),

static/functions/global.js

@@ -6,9 +6,9 @@
 function toggleChecks(formElem, masterElem, elemSelector) {
 	elemSelector = elemSelector || 'input:checkbox';
 	if (masterElem) {
-		$('#'+formElem+' '+elemSelector).prop('checked', masterElem.checked);
+		$('#' + formElem + ' ' + elemSelector).prop('checked', masterElem.checked);
 	} else {
-		$('#'+formElem+' '+elemSelector).each(function() {
+		$('#' + formElem + ' ' + elemSelector).each(function() {
 			this.checked = !this.checked;
 		})
 	}
@@ -24,9 +24,9 @@ function toggleChecks(formElem, masterElem, elemSelector) {
 var lightbox = {
 	init: function (image, size) {
 		if (typeof(image) == 'string') {
-			$('#lightbox').gshow().listen('click',lightbox.unbox).raw().innerHTML =
+			$('#lightbox').gshow().listen('click', lightbox.unbox).raw().innerHTML =
 				'<p size="7" style="color: gray; font-size: 50px;">Loading...<p>';
-			$('#curtain').gshow().listen('click',lightbox.unbox);
+			$('#curtain').gshow().listen('click', lightbox.unbox);
 			var src = image;
 			image = new Image();
 			image.onload = function() {
@@ -51,8 +51,8 @@ var lightbox = {
 			hasA = true;
 		}
 		if (!hasA) {
-			$('#lightbox').gshow().listen('click',lightbox.unbox).raw().innerHTML = '<img src="' + image.src + '" alt="" />';
-			$('#curtain').gshow().listen('click',lightbox.unbox);
+			$('#lightbox').gshow().listen('click', lightbox.unbox).raw().innerHTML = '<img src="' + image.src + '" alt="" />';
+			$('#curtain').gshow().listen('click', lightbox.unbox);
 		}
 	},
 	box_async: function (image) {
@@ -112,9 +112,9 @@ function add_selection() {
 	if (selected.disabled === false) {
 		var listitem = document.createElement("li");
 		listitem.id = 'list' + selected.value;
-		listitem.innerHTML = '						<input type="hidden" name="list[]" value="'+selected.value+'" /> ' +
-'						<span style="float: left;">'+selected.innerHTML+'</span>' +
-'						<a href="#" onclick="remove_selection(\''+selected.value+'\');return false;" style="float: right;" class="brackets">X</a>' +
+		listitem.innerHTML = '						<input type="hidden" name="list[]" value="' + selected.value + '" /> ' +
+'						<span style="float: left;">' + selected.innerHTML + '</span>' +
+'						<a href="#" onclick="remove_selection(\'' + selected.value + '\'); return false;" style="float: right;" class="brackets">X</a>' +
 '						<br style="clear: all;" />';
 		$('#list').raw().appendChild(listitem);
 		$('#opt' + selected.value).raw().disabled = true;
@@ -123,7 +123,7 @@ function add_selection() {
 
 function remove_selection(index) {
 	$('#list' + index).remove();
-	$('#opt' + index).raw().disabled='';
+	$('#opt' + index).raw().disabled = '';
 }
 
 // Thank you http://stackoverflow.com/questions/4578398/selecting-all-text-within-a-div-on-a-single-left-click-with-javascript

static/functions/jquery.datetimepicker.js

@@ -98,11 +98,11 @@
 						event.preventDefault();
 					};
 				});
-				timeboxparent.on('touchend touchcancel',function( event ){
+				timeboxparent.on('touchend touchcancel', function(event){
 					start = false;
 				});
 			}
-			timeboxparent.trigger('resize_scroll.xdsoft_scroller',[_percent]);
+			timeboxparent.trigger('resize_scroll.xdsoft_scroller', [_percent]);
 		});
 	};
 	$.fn.datetimepicker = function( opt ){
@@ -549,7 +549,7 @@
 								}else if( $this.hasClass( options.prev ) ){
 									_xdsoft_datetime.prevMonth();
 								}
-								!stop&&(timer = setTimeout(arguments.callee,v?v:100));
+								!stop && (timer = setTimeout(arguments.callee, v ? v : 100));
 							})(500);
 
 							$([document.body,window]).on('mouseup.xdsoft',function(){

static/functions/requests.js

@@ -18,12 +18,12 @@ function Vote(amount, requestid) {
 		index = true;
 	}
 
-	if (amount > 20*1024*1024) {
+	if (amount > 20 * 1024 * 1024) {
 		upload = $('#current_uploaded').raw().value;
 		download = $('#current_downloaded').raw().value;
 		rr = $('#current_rr').raw().value;
-		if (amount > .3*(upload - rr * download)) {
-			if (!confirm('This vote is more than 30% of your buffer.  Please confirm that you wish to place this large a vote.')) {
+		if (amount > 0.3 * (upload - rr * download)) {
+			if (!confirm('This vote is more than 30% of your buffer. Please confirm that you wish to place this large of a vote.')) {
 				return false;
 			}
 		}
@@ -63,8 +63,8 @@ function Calculate() {
 		$('#bounty_after_tax').raw().innerHTML = "0.00 MB";
 		$('#button').raw().disabled = true;
 	} else if (isNaN($('#amount_box').raw().value)
-			|| (window.location.search.indexOf('action=new') != -1 && $('#amount_box').raw().value*mul < 100*1024*1024)
-			|| (window.location.search.indexOf('action=view') != -1 && $('#amount_box').raw().value*mul < 20*1024*1024)) {
+			|| (window.location.search.indexOf('action=new') != -1 && $('#amount_box').raw().value * mul < 100 * 1024 * 1024)
+			|| (window.location.search.indexOf('action=view') != -1 && $('#amount_box').raw().value * mul < 20 * 1024 * 1024)) {
 		$('#new_uploaded').raw().innerHTML = get_size(($('#current_uploaded').raw().value));
 		$('#new_bounty').raw().innerHTML = "0.00 MB";
 		$('#bounty_after_tax').raw().innerHTML = "0.00 MB";
@@ -120,7 +120,9 @@ function AddArtistField() {
 
 function RemoveArtistField() {
 		var ArtistCount = document.getElementsByName("artists[]").length;
-		if (ArtistCount == 1) { return; }
+		if (ArtistCount == 1) {
+			return;
+		}
 		var x = $('#artistfields').raw();
 
 		while (x.lastChild.tagName != "INPUT") {

static/functions/top10.js

@@ -24,10 +24,12 @@ $(document).ready(function() {
 	}
 
 	function getResized(srcWidth, srcHeight, maxWidth, maxHeight) {
-
 		var ratio = [maxWidth / srcWidth, maxHeight / srcHeight ];
 		ratio = Math.min(ratio[0], ratio[1]);
 
-	    return { width:srcWidth*ratio, height:srcHeight*ratio };
+		return {
+			width: srcWidth * ratio,
+			height: srcHeight * ratio
+		};
 	 }
 });

static/functions/user_notifications.js

@@ -83,7 +83,7 @@ function createNoty(type, id, message, url, importance) {
 			}
 		},
 		{
-			addClass: 'brackets noty_button_close ', text: 'Dismiss', onClick: function($noty) {
+			addClass: 'brackets noty_button_close ', text: 'Hide', onClick: function($noty) {
 				$noty.close();
 			}
 		},

static/styles/global.css

@@ -543,7 +543,7 @@ tr.torrent .bookmark>a:after {
 	overflow: auto;
 }
 
-.setting_description>* {
+.setting_description > * {
 	margin: 1em 0 0 0;
 }
 

static/styles/tiles/style.css

@@ -1,4 +1,3 @@
-
 .tiles_container {
 	position: relative;
 }
@@ -6,7 +5,7 @@
 /**
  * Grid container
  */
- .tiles {
+.tiles {
 	list-style-type: none;
 	position: relative; /** Needed to ensure items are laid out relative to this container **/
 	margin: 0;
@@ -16,7 +15,7 @@
 /**
  * Grid items
  */
- .tiles li {
+.tiles li {
 	background-color: #ffffff;
 	border: 1px solid #dedede;
 	border-radius: 2px;
@@ -43,7 +42,7 @@
 /**
  * Grid item text
  */
- .tiles li p {
+.tiles li p {
 	color: #666;
 	font-size: 12px;
 	margin: 7px 0 0 7px;
@@ -52,7 +51,7 @@
 /**
  * Placerholder css
  */
- .wookmark-placeholder {
+.wookmark-placeholder {
 	border-radius: 2px;
 	-moz-border-radius: 2px;
 	-webkit-border-radius: 2px;