[mashup-dev] svn commit r4715 - in trunk/mashup/java/modules/www: . css xslt

svn at wso2.org svn at wso2.org
Tue Jul 3 04:08:50 PDT 2007


Author: prasad
Date: Tue Jul  3 04:07:31 2007
New Revision: 4715

Modified:
   trunk/mashup/java/modules/www/css/mashups-list.css
   trunk/mashup/java/modules/www/css/reset-fonts-grids.css
   trunk/mashup/java/modules/www/css/widgets.css
   trunk/mashup/java/modules/www/index.html
   trunk/mashup/java/modules/www/xslt/MashupServiceList.xsl
Log:
Added new styles for mashup list.

Modified: trunk/mashup/java/modules/www/css/mashups-list.css
==============================================================================
--- trunk/mashup/java/modules/www/css/mashups-list.css	(original)
+++ trunk/mashup/java/modules/www/css/mashups-list.css	Tue Jul  3 04:07:31 2007
@@ -1,14 +1,13 @@
 .wso2-mashuplisBox {
-/*	background-color:wheat;     */
+/*	background-color:wheat;
 
     background-image: url( ../images/service_list_background.jpg );
     background-position: bottom;
-    background-repeat: repeat-x;
-    border-top: solid 1px #990B0B;
-    border-bottom: solid 1px #990B0B;
-    border-left: solid 1px #990B0B;
-    border-right: solid 1px #990B0B;
-    height: auto;
+    background-repeat: repeat-x;*/
+
+    border-left: dashed 1px #CD6952;
+    margin:0px;
+    height: 100%;
    *height : 45 em;
     overflow: visible;
 
@@ -23,12 +22,12 @@
 }
 
 .wso2-mashuplisBoxTitle {
-/*  background-color:#990B0B;    */
-    background-image: url( ../images/title_bar.jpg );
+/*  background-color:#990B0B;
+    background-image: url( ../images/title_bar.jpg );*/
     color: #000000;
     font: 1.15em Arial;
     font-weight: bold;
-    padding-left: 3px;
+    padding-left: 20px;
     padding-top: 2px;
     padding-bottom: 2px;
 
@@ -65,14 +64,14 @@
     top: 0px;
     font: 1em Arial;
     background-color: #FFFFFF;
-    margin-top: 5px;
+    margin-top: 10px;
     margin-bottom: 5px;
-    margin-left: 2px;
+    margin-left: 10px;
     margin-right: 2px;
-    border-top: solid 1px #FF9933;
+/*    border-top: solid 1px #FF9933;
     border-bottom: solid 1px #FF9933;
     border-left: solid 1px #FF9933;
-    border-right: solid 1px #FF9933;
+    border-right: solid 1px #FF9933;  */
 
     z-index: 1;
     overflow: hidden;

Modified: trunk/mashup/java/modules/www/css/reset-fonts-grids.css
==============================================================================
--- trunk/mashup/java/modules/www/css/reset-fonts-grids.css	(original)
+++ trunk/mashup/java/modules/www/css/reset-fonts-grids.css	Tue Jul  3 04:07:31 2007
@@ -43,8 +43,8 @@
 .yui-t4 .yui-b{float:right;width:20.8456em;*width:20.512em;}
 .yui-t4 #yui-main .yui-b{margin-right:21.8456em;*margin-right:21.512em;}
 
-.yui-t5 .yui-b{float:right;width:18.4608em;*width:18.016em;}
-.yui-t5 #yui-main .yui-b{margin-right:19.4608em;*margin-right:19.016em;}
+.yui-t5 .yui-b{float:right;width:20.4608em;*width:25.016em;}
+.yui-t5 #yui-main .yui-b{margin-right:21.4608em;*margin-right:26.016em;}
 .yui-t6 .yui-b{float:right;width:23.0759em;*width:22.52em;}
 .yui-t6 #yui-main .yui-b{margin-right:24.0759em;*margin-right:23.52em;}
 .yui-t7 #yui-main .yui-b{display:block;margin:0 0 1em 0;}

Modified: trunk/mashup/java/modules/www/css/widgets.css
==============================================================================
--- trunk/mashup/java/modules/www/css/widgets.css	(original)
+++ trunk/mashup/java/modules/www/css/widgets.css	Tue Jul  3 04:07:31 2007
@@ -205,6 +205,7 @@
 	background-image: url(../images/w_top_bg.gif);
 	background-repeat: repeat-x;
 	height: 24px;
+    margin:0px;
 }
 .w_top_left  {
 	width: 13px;
@@ -215,7 +216,7 @@
 }
 .w_top_title {
 	width: 100px;
-	height: 21px;
+	height: 19px;
 	margin-left: 10px;
 	float: left;
 	color: #fff;
@@ -269,6 +270,7 @@
 	padding: 0px;
 	margin-top: 0px;
     margin-bottom:0px;
+    clear:both;
 }
 .w_top_b_panel_left  {
 	width: 13px;
@@ -276,10 +278,11 @@
 	float: left;
 	margin: 0px;
 	padding: 0px;
-	left: 0px;
+	
+    display:inline;
 }
 .w_top_b_panel_title {
-	width: 150px;
+	width: 95px;
 	height: 23px;
 	margin-left: 10px;
 	float: left;
@@ -287,14 +290,16 @@
 	font-weight: normal;
 	font-size: 105%;
 	margin-top: 3px;
+    display:inline;
 }
 .w_top_b_button_panel  {
-	width: 101px;
+	width: 89px;
     *width: 103px;
     height: 26px;
 	float: right;
 	margin: 0px;
 	padding: 0px;
+    display:inline;
 }
 .w_top_b_panel_right  {
 	width: 9px;
@@ -302,12 +307,14 @@
 	float: right;
 	margin: 0px;
 	padding: 0px;
+    display:inline;
 }
 .w_top_b_buttons {
-	width: 92px; 
+	width: 80px; 
 	height: 20px;
 	margin-top: 3px;
 	float: left;
+    display:inline;
 }
 .w_top_b_buttons ul {
 	display: inline;
@@ -329,16 +336,16 @@
 
 /* widget middle styles */
 #col_1 .yui-navset-top {
-	border-left: solid 2px #B5121B;
-	border-right: solid 2px #B5121B;
+	border-left: solid 2px #CD6952;
+	border-right: solid 2px #CD6952;
 	background-image: url(../images/w_middle_bg.gif);
 	background-repeat: repeat-x;
 	background-position: top;
 }
 
 #col_2 .yui-navset-top {
-	border-left: solid 2px #B5121B;
-	border-right: solid 2px #B5121B;
+	border-left: solid 2px #CD6952;
+	border-right: solid 2px #CD6952;
 	background-image: url(../images/w_middle_bg.gif);
 	background-repeat: repeat-x;
 	background-position: top;
@@ -365,3 +372,8 @@
 	margin: 0px;
 	padding: 0px;
 }
+
+.w_top_b_panel_left_right{
+
+ float:right;   
+}
\ No newline at end of file

Modified: trunk/mashup/java/modules/www/index.html
==============================================================================
--- trunk/mashup/java/modules/www/index.html	(original)
+++ trunk/mashup/java/modules/www/index.html	Tue Jul  3 04:07:31 2007
@@ -214,7 +214,7 @@
                             </div>
                         </div>
 
-                        <div id="mashups_list" class="yui-b" style="margin-top:5px; *padding-left:5px;">
+                        <div id="mashups_list" class="yui-b">
 
                             <div id="mashuplist-box" class="wso2-mashuplisBox">
                                 <div class="wso2-mashuplisBoxTitle">Available Mashups

Modified: trunk/mashup/java/modules/www/xslt/MashupServiceList.xsl
==============================================================================
--- trunk/mashup/java/modules/www/xslt/MashupServiceList.xsl	(original)
+++ trunk/mashup/java/modules/www/xslt/MashupServiceList.xsl	Tue Jul  3 04:07:31 2007
@@ -4,7 +4,7 @@
 
         <xsl:variable name="active">
             <xsl:value-of select="active"/>
-        </xsl:variable>       
+        </xsl:variable>
         <xsl:variable name="serviceName">
             <xsl:value-of select="name"/>
         </xsl:variable>
@@ -13,103 +13,233 @@
         </xsl:variable>
 
         <div>
-            <div class="wso2-mashuplistServiceTitle">
-                <xsl:value-of select="$serviceName"/>
+            <!--        <div class="wso2-mashuplistServiceTitle">
+            <xsl:value-of select="$serviceName"/>
+        </div>    -->
+
+            <div class="w_top">
+                <div class="w_top_left">
+                    <img src="images/w_small_top_left.gif"/>
+                </div>
+                <div class="w_top_title">
+                    <xsl:value-of select="$serviceName"/>
+                </div>
+                <div class="w_top_right_panel">
+                    <div class="w_top_right">
+                        <img src="images/w_top_right.gif"/>
+                    </div>
+                </div>
             </div>
-            <div class="wso2-mashuplisBody">
-                <xsl:if test="$active='true'">
-                    <div style="dispaly:inline; float:left; color:green">Service started</div>
-                </xsl:if>
-                <xsl:if test="$active='false'">
-                    <div style="dispaly:inline; float:left; color:red">Service stopped</div>
-                </xsl:if>
-
-                <div style="dispaly:inline; float:right">
-
-                    <xsl:choose>
-                        <xsl:when test="$serviceType='MashupJSService'">
-                            <xsl:choose>
-                                <xsl:when test="$active='true'">
-                                    <xsl:element name="img">
-                                        <xsl:attribute name="src">images/user.gif</xsl:attribute>
-                                        <xsl:attribute name="onclick">javascript:WSO2.MashupUtils.showMashupSharingDialog('<xsl:value-of select="$serviceName"/>');
-                                        </xsl:attribute>
-                                        <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
-                                        <xsl:attribute name="title">Share Service</xsl:attribute>
-                                    </xsl:element>
-                                </xsl:when>
-                                <xsl:otherwise>
-                                    <xsl:element name="img">
-                                        <xsl:attribute name="src">images/user_disabled.gif</xsl:attribute>
-                                        <xsl:attribute name="title">Share Service (Disabled for stopped services)</xsl:attribute>
-                                    </xsl:element>
-                                </xsl:otherwise>
-                            </xsl:choose>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:element name="img">
-                                <xsl:attribute name="src">images/user_disabled.gif</xsl:attribute>                          
-                                <xsl:attribute name="title">Share Service (Disabled for non Js services)</xsl:attribute>
-                            </xsl:element>
-                        </xsl:otherwise>
-                    </xsl:choose>
-
-                    <img src="images/blank.gif" width="2"/>
-
-                    <xsl:choose>
-                        <xsl:when test="$serviceType='MashupJSService'">
-                            <xsl:choose>
-                                <xsl:when test="$active='true'">
-                                    <xsl:element name="img">
-                                        <xsl:attribute name="src">images/application_edit.gif</xsl:attribute>
-                                        <xsl:attribute name="onclick">javascript:wso2.mashup.services.getServiceDataForEditor('<xsl:value-of select="$serviceName"/>', wso2.mashup.populateServiceEditor);
-                                        </xsl:attribute>
-                                        <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
-                                        <xsl:attribute name="title">Edit Service</xsl:attribute>
-                                    </xsl:element>
-                                </xsl:when>
-                                <xsl:otherwise>
-                                    <xsl:element name="img">
-                                        <xsl:attribute name="src">images/application_edit_disabled.gif</xsl:attribute>
-                                        <xsl:attribute name="title">Edit Service  (Disabled for stopped services)</xsl:attribute>
-                                    </xsl:element>
-                                </xsl:otherwise>
-                            </xsl:choose>
-                        </xsl:when>
-                        <xsl:otherwise>
-                             <xsl:element name="img">
-                                <xsl:attribute name="src">images/application_edit_disabled.gif</xsl:attribute>
-                                <xsl:attribute name="title">Edit Service  (Disabled for non Js services)</xsl:attribute>
-                            </xsl:element>
-                        </xsl:otherwise>
-                    </xsl:choose>
-
-                    <img src="images/blank.gif" width="2"/>
-
-                    <xsl:element name="img">
-                        <xsl:attribute name="src">images/control_play_blue.gif</xsl:attribute>
-                        <xsl:attribute name="title">Start Service</xsl:attribute>
-                        <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
-                        <xsl:attribute name="onclick">
-                            javascript:wso2.mashup.services.activationOfService('<xsl:value-of select="$serviceName"/>', true, wso2.mashup.MashupListModel.handleServiceStartStop);
-                        </xsl:attribute>
-                    </xsl:element>
-
-                    <img src="images/blank.gif" width="2"/>
-
-                    <xsl:element name="img">
-                        <xsl:attribute name="src">images/stop.gif</xsl:attribute>
-                        <xsl:attribute name="title">Stop Service</xsl:attribute>
-                        <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
-                        <xsl:attribute name="onclick">
-                            javascript:wso2.mashup.services.activationOfService('<xsl:value-of select="$serviceName"/>', false, wso2.mashup.MashupListModel.handleServiceStartStop);                            
-                        </xsl:attribute>
-                    </xsl:element>
-                    
+
+            <div class="w_top_b_panel">
+                <div class="w_top_b_panel_left">
+                    <img src="images/w_small_top_b_panel_left.gif"/>
+                </div>
+                <div class="w_top_b_panel_title">
+
+                    <xsl:if test="$active='true'">
+                        <div style="dispaly:inline; float:left; color:green">Service started</div>
+                    </xsl:if>
+                    <xsl:if test="$active='false'">
+                        <div style="dispaly:inline; float:left; color:red">Service stopped</div>
+                    </xsl:if>
+
+                </div>
+                <div class="w_top_b_button_panel">
+                    <div class="w_top_b_buttons">
+                        <ul>
+                            <li>
+                                <xsl:choose>
+                                    <xsl:when test="$serviceType='MashupJSService'">
+                                        <xsl:choose>
+                                            <xsl:when test="$active='true'">
+                                                <xsl:element name="img">
+                                                    <xsl:attribute name="src">images/w_share.gif</xsl:attribute>
+                                                    <xsl:attribute name="onclick">javascript:WSO2.MashupUtils.showMashupSharingDialog('<xsl:value-of select="$serviceName"/>');
+                                                    </xsl:attribute>
+                                                    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
+                                                    <xsl:attribute name="title">Share Service</xsl:attribute>
+                                                </xsl:element>
+                                            </xsl:when>
+                                            <xsl:otherwise>
+                                                <xsl:element name="img">
+                                                    <xsl:attribute name="src">images/w_stopped_share.gif</xsl:attribute>
+                                                    <xsl:attribute name="title">Share Service (Disabled for stopped
+                                                        services)
+                                                    </xsl:attribute>
+                                                </xsl:element>
+                                            </xsl:otherwise>
+                                        </xsl:choose>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:element name="img">
+                                            <xsl:attribute name="src">images/w_stopped_share.gif</xsl:attribute>
+                                            <xsl:attribute name="title">Share Service (Disabled for non Js services)
+                                            </xsl:attribute>
+                                        </xsl:element>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+
+
+                            </li>
+                            <li>
+                                <xsl:choose>
+                                    <xsl:when test="$serviceType='MashupJSService'">
+                                        <xsl:choose>
+                                            <xsl:when test="$active='true'">
+                                                <xsl:element name="img">
+                                                    <xsl:attribute name="src">images/w_edit.gif</xsl:attribute>
+                                                    <xsl:attribute name="onclick">javascript:wso2.mashup.services.getServiceDataForEditor('<xsl:value-of select="$serviceName"/>', wso2.mashup.populateServiceEditor);</xsl:attribute>
+                                                    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
+                                                    <xsl:attribute name="title">Edit Service</xsl:attribute>
+                                                </xsl:element>
+                                            </xsl:when>
+                                            <xsl:otherwise>
+                                                <xsl:element name="img">
+                                                    <xsl:attribute name="src">images/w_stopped_edit.gif</xsl:attribute>
+                                                    <xsl:attribute name="title">Edit Service (Disabled for stopped services)
+                                                    </xsl:attribute>
+                                                </xsl:element>
+                                            </xsl:otherwise>
+                                        </xsl:choose>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:element name="img">
+                                            <xsl:attribute name="src">images/w_stopped_edit.gif</xsl:attribute>
+                                            <xsl:attribute name="title">Edit Service (Disabled for non Js services)
+                                            </xsl:attribute>
+                                        </xsl:element>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+
+
+                            </li>
+                            <li>
+                                <xsl:element name="img">
+                                    <xsl:attribute name="src">images/w_start.gif</xsl:attribute>
+                                    <xsl:attribute name="title">Start Service</xsl:attribute>
+                                    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
+                                    <xsl:attribute name="onclick">javascript:wso2.mashup.services.activationOfService('<xsl:value-of select="$serviceName"/>', true, wso2.mashup.MashupListModel.handleServiceStartStop); </xsl:attribute>
+                                </xsl:element>
+
+
+                            </li>
+                            <li>
+
+                                <xsl:element name="img">
+                                    <xsl:attribute name="src">images/w_stop.gif</xsl:attribute>
+                                    <xsl:attribute name="title">Stop Service</xsl:attribute>
+                                    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
+                                    <xsl:attribute name="onclick">javascript:wso2.mashup.services.activationOfService('<xsl:value-of select="$serviceName"/>', false, wso2.mashup.MashupListModel.handleServiceStartStop);</xsl:attribute>
+                                </xsl:element>
+
+
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="w_top_b_panel_left_right">
+                        <img src="images/w_top_b_panel_right.gif"/>
+                    </div>
                 </div>
+            </div>
+
+
+            <!--
+
+        <div class="wso2-mashuplisBody">
+            <xsl:if test="$active='true'">
+                <div style="dispaly:inline; float:left; color:green">Service started</div>
+            </xsl:if>
+            <xsl:if test="$active='false'">
+                <div style="dispaly:inline; float:left; color:red">Service stopped</div>
+            </xsl:if>
+
+            <div style="dispaly:inline; float:right">
+
+                <xsl:choose>
+                    <xsl:when test="$serviceType='MashupJSService'">
+                        <xsl:choose>
+                            <xsl:when test="$active='true'">
+                                <xsl:element name="img">
+                                    <xsl:attribute name="src">images/user.gif</xsl:attribute>
+                                    <xsl:attribute name="onclick">javascript:WSO2.MashupUtils.showMashupSharingDialog('<xsl:value-of select="$serviceName"/>');
+                                    </xsl:attribute>
+                                    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
+                                    <xsl:attribute name="title">Share Service</xsl:attribute>
+                                </xsl:element>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:element name="img">
+                                    <xsl:attribute name="src">images/user_disabled.gif</xsl:attribute>
+                                    <xsl:attribute name="title">Share Service (Disabled for stopped services)</xsl:attribute>
+                                </xsl:element>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:element name="img">
+                            <xsl:attribute name="src">images/user_disabled.gif</xsl:attribute>
+                            <xsl:attribute name="title">Share Service (Disabled for non Js services)</xsl:attribute>
+                        </xsl:element>
+                    </xsl:otherwise>
+                </xsl:choose>
+
+                <img src="images/blank.gif" width="2"/>
+
+                <xsl:choose>
+                    <xsl:when test="$serviceType='MashupJSService'">
+                        <xsl:choose>
+                            <xsl:when test="$active='true'">
+                                <xsl:element name="img">
+                                    <xsl:attribute name="src">images/application_edit.gif</xsl:attribute>
+                                    <xsl:attribute name="onclick">javascript:wso2.mashup.services.getServiceDataForEditor('<xsl:value-of select="$serviceName"/>', wso2.mashup.populateServiceEditor);
+                                    </xsl:attribute>
+                                    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
+                                    <xsl:attribute name="title">Edit Service</xsl:attribute>
+                                </xsl:element>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:element name="img">
+                                    <xsl:attribute name="src">images/application_edit_disabled.gif</xsl:attribute>
+                                    <xsl:attribute name="title">Edit Service  (Disabled for stopped services)</xsl:attribute>
+                                </xsl:element>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:when>
+                    <xsl:otherwise>
+                         <xsl:element name="img">
+                            <xsl:attribute name="src">images/application_edit_disabled.gif</xsl:attribute>
+                            <xsl:attribute name="title">Edit Service  (Disabled for non Js services)</xsl:attribute>
+                        </xsl:element>
+                    </xsl:otherwise>
+                </xsl:choose>
+
+                <img src="images/blank.gif" width="2"/>
+
+                <xsl:element name="img">
+                    <xsl:attribute name="src">images/control_play_blue.gif</xsl:attribute>
+                    <xsl:attribute name="title">Start Service</xsl:attribute>
+                    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
+                    <xsl:attribute name="onclick">
+                        javascript:wso2.mashup.services.activationOfService('<xsl:value-of select="$serviceName"/>', true, wso2.mashup.MashupListModel.handleServiceStartStop);
+                    </xsl:attribute>
+                </xsl:element>
+
+                <img src="images/blank.gif" width="2"/>
+
+                <xsl:element name="img">
+                    <xsl:attribute name="src">images/stop.gif</xsl:attribute>
+                    <xsl:attribute name="title">Stop Service</xsl:attribute>
+                    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
+                    <xsl:attribute name="onclick">
+                        javascript:wso2.mashup.services.activationOfService('<xsl:value-of select="$serviceName"/>', false, wso2.mashup.MashupListModel.handleServiceStartStop);
+                    </xsl:attribute>
+                </xsl:element>
 
             </div>
 
+        </div>    -->
+
         </div>
     </xsl:template>
 




More information about the Mashup-dev mailing list