From weld-commits at lists.jboss.org Wed Jun 16 22:46:35 2010
Content-Type: multipart/mixed; boundary="===============7288744823045954134=="
MIME-Version: 1.0
From: weld-commits at lists.jboss.org
To: weld-commits at lists.jboss.org
Subject: [weld-commits] Weld SVN: r6475 - in
 examples/trunk/jsf/pastecode/src/main/webapp: style and 1 other directory.
Date: Wed, 16 Jun 2010 22:46:34 -0400
Message-ID: <201006170246.o5H2kY9Q002941@svn01.web.mwc.hst.phx2.redhat.com>

--===============7288744823045954134==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: shane.bryzak(a)jboss.com
Date: 2010-06-16 22:46:34 -0400 (Wed, 16 Jun 2010)
New Revision: 6475

Modified:
   examples/trunk/jsf/pastecode/src/main/webapp/display.xhtml
   examples/trunk/jsf/pastecode/src/main/webapp/style/style.css
Log:
adjust styles on display page


Modified: examples/trunk/jsf/pastecode/src/main/webapp/display.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/jsf/pastecode/src/main/webapp/display.xhtml	2010-06-17 0=
2:24:50 UTC (rev 6474)
+++ examples/trunk/jsf/pastecode/src/main/webapp/display.xhtml	2010-06-17 0=
2:46:34 UTC (rev 6475)
@@ -32,41 +32,27 @@
   	</ui:define>
 =

    	<ui:define name=3D"mainarea">
-   		<div style=3D"width: 100%; padding: 7px;">
-	   		    =

-		   		<h:panelGrid columns=3D"3" style=3D"width: 80%; margin: 0px; paddin=
g: 0px;">
+	   	<div class=3D"contentHeader">
+	   	  Posted by #{pasteWindow.codeFragment.user} on #{pasteWindow.codeFra=
gment.friendlyDate}
+	   	  <div style=3D"float:right">
+  	  	  <a href=3D"download?id=3D#{pasteWindow.codeFragment.hash =3D=3D nu=
ll ? pasteWindow.codeFragment.id : pasteWindow.codeFragment.hash}" style=3D=
"text-decoration: none;">DOWNLOAD</a>
+  	  	</div>
+	   	</div>
 =

-		   			<h:panelGroup>
-		   				<h:outputLabel for=3D"user" value=3D"User: "/>   		=

-						<h:outputText id=3D"user" maxlength=3D"30" size=3D"30" value=3D"#{pa=
steWindow.codeFragment.user}"/>
-		   			</h:panelGroup>
-
-		   			<h:panelGroup>
-		   				<h:outputLabel for=3D"theme" value=3D"Choose theme: "/>   =

-		   				<h:selectOneMenu id=3D"theme" value=3D"#{pasteWindow.theme}" onch=
ange=3D"chooseStyle(this.value);"> <!-- this.form.submit() -->		=

-		   					<f:selectItems value=3D"#{themes}" var=3D"theme" itemLabel=3D"#{=
theme.name}" itemValue=3D"#{theme.name}" />
-			   			</h:selectOneMenu>
-			   			<a href=3D"download?id=3D#{pasteWindow.codeFragment.hash =3D=3D n=
ull ? pasteWindow.codeFragment.id : pasteWindow.codeFragment.hash}" style=
=3D"text-decoration: none;"><input type=3D"button" value=3D"Download file" =
/></a>
-		   			</h:panelGroup>
-
-		   			<h:panelGroup style=3D"text-align:right;">			   				   			=

-		   				<h:outputLabel for=3D"unwrap" value=3D"Unwrap code: "/>   =

-		   				<h:selectBooleanCheckbox id=3D"unwrap" onchange=3D"unwrap('codear=
ea');"/>
-		   			</h:panelGroup>
-
-		   		</h:panelGrid>
+      <div class=3D"formRow">   		   		    =

+  			<h:outputLabel for=3D"theme" value=3D"Choose theme: "/>   =

+		   	<h:selectOneMenu id=3D"theme" value=3D"#{pasteWindow.theme}" onchang=
e=3D"chooseStyle(this.value);"> <!-- this.form.submit() -->		=

+		   	  <f:selectItems value=3D"#{themes}" var=3D"theme" itemLabel=3D"#{th=
eme.name}" itemValue=3D"#{theme.name}" />
+			  </h:selectOneMenu>
+			</div>
+			  =

+			<!--h:outputLabel for=3D"unwrap" value=3D"Unwrap code: "/>   =

+			<h:selectBooleanCheckbox id=3D"unwrap" onchange=3D"unwrap('codearea');"=
/-->
 		   		=

-		   		<h:outputText value=3D"Pasted code: "/>
-		   		<div id=3D"codearea" style=3D"width:99%; border: 1px solid #7F7F7F;=
 height:450px; overflow:scroll;">			   		=

-			   			<pre class=3D"brush: #{pasteWindow.codeFragment.language.brush}">=
#{pasteWindow.codeFragment.text}</pre>	=

-		   		</div>
-		   		=

-		   		&nbsp;<br/>
-		   		<h:outputLabel for=3D"note" value=3D"Note: "/>
-		   		<div >		   			 =

-		   			<h:outputText id=3D"note" value=3D"#{pasteWindow.codeFragment.note=
}"/>		   			=

-		   		</div>
+   		<div id=3D"codearea" style=3D"width:99%; border: 1px solid #7F7F7F; h=
eight:450px; overflow:scroll;">			   		=

+   			<pre class=3D"brush: #{pasteWindow.codeFragment.language.brush}">#{p=
asteWindow.codeFragment.text}</pre>	=

    		</div>
+		   		=

    	</ui:define>
    	=

     <ui:define name=3D"rightmenu">

Modified: examples/trunk/jsf/pastecode/src/main/webapp/style/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/jsf/pastecode/src/main/webapp/style/style.css	2010-06-17=
 02:24:50 UTC (rev 6474)
+++ examples/trunk/jsf/pastecode/src/main/webapp/style/style.css	2010-06-17=
 02:46:34 UTC (rev 6475)
@@ -98,6 +98,11 @@
   margin: 8px 4px 8px 4px;
 }
 =

+div.contentHeader a, div.contentHeader a:visited, div.contentHeader a:hove=
r {
+  font-weight: normal;
+  color: #ff0000;
+}
+
 /* General form styles */
 =

 .pastecode {
@@ -111,7 +116,7 @@
 =

 div.formRow {
   padding: 3px 4px 3px 2px;  =

-  clear: both;
+/*  clear: both;*/
 }
 =

 div.formRow label {


--===============7288744823045954134==--