Changeset 596 for ether_statistics/web/project/statistics.jsp

Timestamp:

10/25/12 17:21:33 (12 years ago)

Author:

vmipsl

Message:

wijmo (linechart, barchart), credits, mentions

File:

• ether_statistics/web/project/statistics.jsp (modified) (3 diffs)

ether_statistics/web/project/statistics.jsp

@@ -14 +14 @@
 
     <ether:htmlCss cssFile="button"/>
-    <ether:htmlCss cssFile="complexButton"/>
-    <ether:htmlCss cssFile="jquery-ui-1.8.16.custom/jquery-ui-1.8.16.custom"/>
+    <%--<ether:htmlCss cssFile="jquery-ui-1.8.16.custom/jquery-ui-1.8.16.custom"/>--%>
+    <%-- WIJMO --%>
+    <ether:htmlCss cssFile="Wijmo/rocket/jquery-wijmo"/>
+    <ether:htmlCss cssFile="Wijmo/jquery.wijmo-complete.all.2.0.0.min"/>
+
     <ether:htmlCss cssFile="ether"/>
     <ether:htmlCss cssFile="statistics"/>
 
-    <ether:htmlJs jsFile="library/jquery-1.4.2.min"/>
+    <ether:htmlJs jsFile="library/jquery-1.8.2"/>
+    <ether:htmlJs jsFile="library/jquery-ui-1.9.0.custom"/>
     <ether:htmlJs jsFile="library/jquery.class"/>
     <ether:htmlJs jsFile="library/jquery.protify-0.3"/>
     <ether:htmlJs jsFile="classesForJQuery/etherHelper"/>
     <ether:htmlJs jsFile="classesForJQuery/Button"/>
-    <ether:htmlJs jsFile="classesForJQuery/ComplexButton"/>
     <ether:htmlJs jsFile="classesForJQuery/DragSlide"/>
-    <ether:htmlJs jsFile="TwitterLogin/javascripts/jquery.tipsy"/>
-    <ether:htmlJs jsFile="jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min"/>
+
+    <%-- WIJMO --%>
+    <ether:htmlJs jsFile="Wijmo.2.2.2/Wijmo-Open/js/jquery.wijmo-open.all.2.2.2.min"/>
+    <ether:htmlJs jsFile="Wijmo.2.2.2/Wijmo-Complete/js/jquery.wijmo-complete.all.2.2.2.min"/>
 
     <ether:htmlJsp jspFile="statistics-script"/>
@@ -44 +49 @@
         </div>
 
-        <div id="login" class="loginToClick containerToDrag">
-            <img id="login_bg" class="loginToClick" src='resources/images/cloud.png' width="88px" height="71px"/>
-            <img id="login_button" class="loginToClick" src='resources/images/Milky/Chat.png' width="30px" height="30px"/>
+        <div id="login" class="containerToDrag">
+            <img id="login_bg" src='resources/images/cloud.png' width="88px" height="71px"/>
+            <img id="login_button" src='resources/images/Milky/Chat.png' width="30px" height="30px"/>
 
             <div id="login_text">
@@ -71 +76 @@
         </div>
 
+        <div id="help" class="containerToDrag"><img id="help" src='resources/images/help.gif' width="40px" height="40px"/></div>
+
+        <div id="credits" class="containerToDrag">
+            <img id="credits_bg" src='resources/images/cloud.png' width="59px" height="42px"/>
+            <div id="credits_title"><spring:message code="label.credits"/></div>
+            <div id="credits_text"></div>
+        </div>
+
+        <div id="mentions" class="containerToDrag">
+            <img id="mentions_bg" src='resources/images/cloud.png' width="59px" height="42px"/>
+            <div id="mentions_title"><spring:message code="label.mentions"/></div>
+            <div id="mentions_text"></div>
+        </div>
+
     </div>