Merge pull request #207 from paulej72/master

More 14.06 bug fixes.
SoylentNews · May 29, 2014 · f551ea1 · f551ea1
2 parents 3f2661e + dc662f5
commit f551ea1
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 20 deletions.
diff --git a/plugins/Admin/templates/editStory;admin;default b/plugins/Admin/templates/editStory;admin;default
@@ -78,12 +78,12 @@ __template__
 				[% END %]
 				[% shown_in_desc %]
 				[% PROCESS formLabel value => "Title" %]
-				<input type="text" name="title" value="[% storyref.title | strip_attribute %]" size="75" MAXLENGTH="100">
+				<input class="fullbox" type="text" name="title" value="[% storyref.title | strip_attribute %]" size="75" MAXLENGTH="100">
 				<div class="notes">[% ispell_comments.title %]</div>
 
 				[% IF constants.use_dept %]
 					[% PROCESS formLabel value => "Dept" %]
-					<input type="text" name="dept" value="[% storyref.dept | strip_attribute %]" size="75" MAXLENGTH="100">
+					<input class="fullbox" type="text" name="dept" value="[% storyref.dept | strip_attribute %]" size="75" MAXLENGTH="100">
 				[% END %]
 
 				[% PROCESS formLabel value="Author" %]
@@ -96,7 +96,7 @@ __template__
 					[% IF extra.2 == 'text' %]
 						<input type="text" name="[% extra.1 %]" value="[% storyref.${extra.1} | strip_attribute %]" size="50">
 					[% ELSIF extra.2 == 'textarea' %]
-						<textarea wrap="virtual" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]" name="[% extra.1 %]">[% storyref.${extra.1} | strip_literal %]</textarea>
+						<textarea class="fullbox" wrap="virtual" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]" name="[% extra.1 %]">[% storyref.${extra.1} | strip_literal %]</textarea>
 					[% ELSIF extra.2 == 'list' %]
 						[% Slash.createSelect(extra.1, Slash.db.getDescriptions('genericstring',extra.1), storyref.${extra.1}, 1, 1) %]	
 					[% END %]
@@ -158,7 +158,7 @@ __template__
 				<label>
 					Intro Copy[% IF storyref.introtext_wordcount %] <em>([% storyref.introtext_wordcount %] word[% IF storyref.introtext_wordcount != 1; "s"; END %])</em>[% END %]
 				</label>
-				<textarea wrap="virtual" name="introtext" cols="[% user.textarea_cols || constants.textarea_cols %]" rows="10">[% storyref.introtext | strip_literal %]</textarea>
+				<textarea class="fullbox" wrap="virtual" name="introtext" cols="[% user.textarea_cols || constants.textarea_cols %]" rows="10">[% storyref.introtext | strip_literal %]</textarea>
 				<div class="notes">[% ispell_comments.introtext %]</div>
 
 				[% PROCESS editbuttons %]
@@ -227,12 +227,12 @@ __template__
 				<label>
 					<a href="#" onclick="$('#admin-bodytext').toggle(); return false">Extended Copy</a>[% IF storyref.bodytext_wordcount %] <em>([% storyref.bodytext_wordcount %] word[% IF storyref.bodytext_wordcount != 1; "s"; END %])</em>[% END %]
 				</label>
-				<textarea name="bodytext" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]" wrap="virtual" id="admin-bodytext" class="[% storyref.bodytext ? "show" : "hide" %]">[% storyref.bodytext | strip_literal %]</textarea>
+				<textarea class="fullbox" name="bodytext" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]" wrap="virtual" id="admin-bodytext" class="[% storyref.bodytext ? "show" : "hide" %]">[% storyref.bodytext | strip_literal %]</textarea>
 				<label>
 					<a href="#" onclick="$('#admin-media').toggle(); return false">Media</a>
 				</label>
 				<a name="media"></a>
-				<textarea name="media" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]" wrap="virtual" id="admin-media" class="[% storyref.media ? "show" : "hide" %]">[% storyref.media | strip_literal %]</textarea>
+				<textarea class="fullbox" name="media" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]" wrap="virtual" id="admin-media" class="[% storyref.media ? "show" : "hide" %]">[% storyref.media | strip_literal %]</textarea>
 				<div class="notes">[% ispell_comments.bodytext %]</div>
 				[% PROCESS editbuttons %]
 			</fieldset>

diff --git a/plugins/Journal/templates/journaledit;journal;default b/plugins/Journal/templates/journaledit;journal;default
@@ -21,7 +21,7 @@ __template__
 
 					[% PROCESS formLabel value => "Subject" %]
 					[% PROCESS formNote note => "This is required" %]
-					<input type="text" name="description" size="60" maxlength="60" value="[% article.description | strip_attribute %]">
+					<input class="fullbox" type="text" name="description" size="60" maxlength="60" value="[% article.description | strip_attribute %]">
 					[% PROCESS formLabel value => "Journal Topic", comment => "";
 					   def_topic = article.tid || constants.journal_default_topic;
 					   Slash.selectTopic('tid', def_topic, '', 1) %]
@@ -42,7 +42,7 @@ __template__
 						[% PROCESS formNote note => "Comments are enabled" %]
 					[% END %]
 					[% PROCESS formLabel value => "Entry" %]
-					<textarea wrap="virtual" name="article" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]">[% article.article | strip_literal %]</textarea>
+					<textarea class="fullbox" wrap="virtual" name="article" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]">[% article.article | strip_literal %]</textarea>
 					<br>
 					[% format_select %]
 					<br>

diff --git a/plugins/Submit/templates/displayForm;submit;default b/plugins/Submit/templates/displayForm;submit;default
@@ -99,7 +99,7 @@ __template__
 			[% END %]
 
 			[% PROCESS formLabel value => "Subject"  %]
-			<input type="text" name="subj" value="[% form.subj %]" size="75" maxlength="100">
+			<input class="fullbox" type="text" name="subj" value="[% form.subj %]" size="75" maxlength="100">
 			[% PROCESS formNote note => "Be descriptive and concise!" %]
 			[% PROCESS formNote note => "(Nondescriptive subjects like 'Check this out!' usually just get deleted, because we get many every day. For best results, put the important words early.)" %]
 
@@ -148,7 +148,7 @@ __template__
 			[% PROCESS formNote note => "In general, submit to $submitToLabel" %]
 
 			[% PROCESS formLabel value => "The Scoop" %]
-			<textarea wrap="virtual" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]" name="story">[% form.story | strip_literal %]</textarea><br>
+			<textarea class="fullbox" wrap="virtual" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]" name="story">[% form.story | strip_literal %]</textarea><br>
 			[% PROCESS formNote note => "Are you sure you included a URL?  Did you test them for typos?" %]
 			[% PROCESS formNote note => "HTML is fine, but double check those URLs and HTML tags!" %]
 			[% PROCESS formLabel value => "Submission format", comment => "" %]

diff --git a/themes/chillax/htdocs/chillax.cssraw b/themes/chillax/htdocs/chillax.cssraw
@@ -240,10 +240,10 @@ div.storylinks
 
 div.storylinks div ul 
 {
-	padding: .4em 1em .8em; 
+	padding: .5em 1em 1em; 
 	margin: 0;
 	height: 1em;
-	line-height: .95em;
+	line-height: .875em;
 }
 
 div.storylinks ul li 

diff --git a/themes/default/htdocs/admin.cssraw b/themes/default/htdocs/admin.cssraw
@@ -6,7 +6,6 @@ body.admin
 
 .admin fieldset { margin: 0 0 1em 1em; }
 label.checkbox { display: inline; }
-input {width: auto !important;}
 .contentsadmin
 {
 	width: auto;

diff --git a/themes/default/htdocs/base.css b/themes/default/htdocs/base.css
@@ -356,6 +356,13 @@ input[type=submit]:hover, .logout a:hover, div.storylinks ul li.more a:hover {ba
 
 input[type=text], input[type=password] {border: 1px solid #555; font-size: 1em;}
 
+.fullbox{
+	width: 100%;
+	-webkit-box-sizing:border-box;
+	-moz-box-sizing:border-box;
+	box-sizing:border-box;
+}
+
 #login-block {display: none;}
 
 /* FORMTABS */

diff --git a/themes/default/templates/edit_comment;comments;default b/themes/default/templates/edit_comment;comments;default
@@ -117,7 +117,7 @@ END %]
 	[% END %]
 
 		[% PROCESS formLabel value => 'Comment' %]
-		<textarea wrap="virtual" name="postercomment" id="postercomment" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]">[% form.postercomment | strip_literal %]</textarea>
+		<textarea class="fullbox" wrap="virtual" name="postercomment" id="postercomment" rows="[% user.textarea_rows || constants.textarea_rows %]" cols="[% user.textarea_cols || constants.textarea_cols %]">[% form.postercomment | strip_literal %]</textarea>
 		[% PROCESS formNote note => 'Use the Preview Button! Check those URLs!' %]
 		<br>
 		[% IF user.is_anon %]

diff --git a/themes/default/templates/userlogin;misc;default b/themes/default/templates/userlogin;misc;default
@@ -22,13 +22,13 @@ __template__
 	<label>
 		Nickname
 	</label>
-	<input type="text" name="unickname" style="width: 18em;" value="" maxlength="[% constants.nick_maxlen %]">
+	<input class="fullbox" type="text" name="unickname" value="" maxlength="[% constants.nick_maxlen %]">
 	<label>
 		Password
 	</label>
 	<input type="hidden" name="returnto" value="[% return_url | strip_urlattr %]">
 	<input type="hidden" name="op" value="userlogin">
-	<input type="password" name="upasswd" style="width: 18em;">
+	<input class="fullbox" type="password" name="upasswd">
 	<label class="checkbox">
 		<input type="checkbox" name="login_temp" value="yes">
 		Public Terminal

diff --git a/themes/night/htdocs/night.cssraw b/themes/night/htdocs/night.cssraw
@@ -272,10 +272,10 @@ div.storylinks
 
 div.storylinks div ul 
 {
-	padding: .4em 1em .8em; 
+	padding: .5em 1em 1em; 
 	margin: 0;
 	height: 1em;
-	line-height: .95em;
+	line-height: .875em;
 }
 
 div.storylinks ul li 

diff --git a/themes/soylentnews/htdocs/soylentnews.cssraw b/themes/soylentnews/htdocs/soylentnews.cssraw
@@ -240,10 +240,10 @@ div.storylinks
 
 div.storylinks div ul 
 {
-	padding: .4em 1em .8em; 
+	padding: .5em 1em 1em; 
 	margin: 0;
 	height: 1em;
-	line-height: .95em;
+	line-height: .875em;
 }
 
 div.storylinks ul li