org...

alexdma Fri, 08 Jul 2011 01:56:01 -0700

Author: alexdma
Date: Fri Jul  8 08:55:22 2011
New Revision: 1144199

URL: http://svn.apache.org/viewvc?rev=1144199&view=rev
Log:
Applied patch by Alberto Musetti that unifies Web templates for ontonet, 
reasoners and rules endpoints. This is required for STANBOL-177


Modified:
    
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/static/css/ontonet.css
    
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/static/css/reasoners.css
    
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/static/css/rules.css
    
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/imports/ruleSyntax.ftl
    
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/org/apache/stanbol/rules/web/resources/RulesRootResource/index.ftl

Modified: 
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/static/css/ontonet.css
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/static/css/ontonet.css?rev=1144199&r1=1144198&r2=1144199&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/static/css/ontonet.css
 (original)
+++ 
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/static/css/ontonet.css
 Fri Jul  8 08:55:22 2011
@@ -1,6 +1,5 @@
 div.indent {
        margin-left: 20px;
-       display: none; 
 }
 
 input.hide-button{

Modified: 
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/static/css/reasoners.css
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/static/css/reasoners.css?rev=1144199&r1=1144198&r2=1144199&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/static/css/reasoners.css
 (original)
+++ 
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/static/css/reasoners.css
 Fri Jul  8 08:55:22 2011
@@ -1,6 +1,5 @@
 div.indent {
-       margin-left: 20px;
-       display: none; 
+       margin-left: 20px; 
 }
 
 input.hide-button{

Modified: 
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/static/css/rules.css
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/static/css/rules.css?rev=1144199&r1=1144198&r2=1144199&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/static/css/rules.css
 (original)
+++ 
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/static/css/rules.css
 Fri Jul  8 08:55:22 2011
@@ -1,6 +1,13 @@
+#rules-tutorial{
+       margin-bottom: 20px;
+}
+
+#rules-syntax{
+       margin-bottom: 20px;
+}
+
 div.indent {
        margin-left: 20px;
-       display: none; 
 }
 
 input.hide-button{

Modified: 
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/imports/ruleSyntax.ftl
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/imports/ruleSyntax.ftl?rev=1144199&r1=1144198&r2=1144199&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/imports/ruleSyntax.ftl
 (original)
+++ 
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/imports/ruleSyntax.ftl
 Fri Jul  8 08:55:22 2011
@@ -1,6 +1,6 @@
 <#macro view>
 
-<H3>TOKENS</H2> 
+<H4>TOKEN</H4>
 <TABLE> 
  <!-- Token --> 
  <TR> 
@@ -9,8 +9,7 @@
 &lt;DEFAULT&gt; SKIP : {
 " "
 }
- 
-   </PRE> 
+</PRE> 
   </TD> 
  </TR> 
  <!-- Token --> 
@@ -22,7 +21,6 @@
 | "\t"
 | "\n"
 }
- 
    </PRE> 
   </TD> 
  </TR> 
@@ -70,7 +68,6 @@
 | &lt;IS_BLANK: "isBlank"&gt;
 | &lt;FORWARD_CHAIN: "!"&gt;
 }
- 
    </PRE> 
   </TD> 
  </TR> 
@@ -85,7 +82,6 @@
 | &lt;LQUAD: "["&gt;
 | &lt;RQUAD: "]"&gt;
 }
- 
    </PRE> 
   </TD> 
  </TR> 
@@ -102,12 +98,11 @@
 | &lt;SPARQL_STRING: "%" 
(["0"-"9","a"-"z","A"-"Z","-","_",".",":","/","#","\\","?"," 
","!","$","%","{","}","(",")","\"","&lt;","&gt;","=","+","\n","\t","&amp;","|",","])+
 "%"&gt;
 | &lt;BNODE: "_:" (["0"-"9","a"-"z","A"-"Z","-","_","."])+&gt;
 }
- 
    </PRE> 
   </TD> 
  </TR> 
 </TABLE> 
-<H3>NON-TERMINALS</H2> 
+<H4>NON-TERMINALS</H4> 
 <TABLE> 
 <TR> 
 <TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod1">start</A></TD> 

Modified: 
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/org/apache/stanbol/rules/web/resources/RulesRootResource/index.ftl
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/org/apache/stanbol/rules/web/resources/RulesRootResource/index.ftl?rev=1144199&r1=1144198&r2=1144199&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/org/apache/stanbol/rules/web/resources/RulesRootResource/index.ftl
 (original)
+++ 
incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/org/apache/stanbol/rules/web/resources/RulesRootResource/index.ftl
 Fri Jul  8 08:55:22 2011
@@ -7,56 +7,41 @@
 <#import "/imports/tutorial4.ftl" as tutorial4>
 <#import "/imports/tutorial5.ftl" as tutorial5>
 <#escape x as x?html>
-<@common.page title="Apache Stanbol Rules" hasrestapi=false> 
+<@common.page title="Apache Stanbol Rules" hasrestapi=true>
 
-<div id="syntax-title" class="title-point">Rules syntax in BNF
-<input id="show-syntax-button" class="show-button" value="show" type="button" 
onClick="javascript:var interaction = new Interaction(); 
interaction.show('syntax');">
-<input id="hide-syntax-button" class="hide-button" value="hide" type="button" 
onClick="javascript:var interaction = new Interaction(); 
interaction.hide('syntax');">
-<div id="syntax-body"  class="indent">
+ <div class="panel" id="webview">
+          
+       <div id="rules-tutorial" class="title-point">
+               <h3>Rules tutorial</h3>
+               <div id="tutorial-body">
+                       <div id="tutorial0" class="active"><@tutorial0.view 
/></div>
 
-<@ruleSyntax.view /> 
+                       <div id="tutorial1" class="inactive"><@tutorial1.view 
/></div>
 
-</div> 
-</div>
+                       <div id="tutorial2" class="inactive"><@tutorial2.view 
/></div>
 
+                       <div id="tutorial3" class="inactive"><@tutorial3.view 
/></div>
 
-<div id="tutorial-title" class="title-point">Rules tutorial
-<input id="show-tutorial-button" class="show-button" value="show" 
type="button" onClick="javascript:var interaction = new Interaction(); 
interaction.show('tutorial');">
-<input id="hide-tutorial-button" class="hide-button" value="hide" 
type="button" onClick="javascript:var interaction = new Interaction(); 
interaction.hide('tutorial');">
-<div id="tutorial-body" class="indent">
+                       <div id="tutorial4" class="inactive"><@tutorial4.view 
/></div>
 
-<div id="tutorial0" class="active"> 
-<@tutorial0.view />
-</div>
-
-<div id="tutorial1" class="inactive"> 
-<@tutorial1.view />
-
-
-</div>
-
-<div id="tutorial2" class="inactive"> 
-<@tutorial2.view />
-</div>
-
-<div id="tutorial3" class="inactive"> 
-<@tutorial3.view />
-</div>
-
-<div id="tutorial4" class="inactive"> 
-<@tutorial4.view />
-</div>
-
-<div id="tutorial5" class="inactive"> 
-<@tutorial5.view />
-</div>
+                       <div id="tutorial5" class="inactive"><@tutorial5.view 
/></div>
  
-<div class="arrows">
-<a id="previous" href="javascript:var interaction = new Interaction(); 
interaction.previousTutorial()">Previous</a> | <a id="next" 
href="javascript:var interaction = new Interaction(); 
interaction.nextTutorial()">Next</a>
-</div>
+               </div> <!-- end tutorial-body -->
+               
+               <div class="arrows">
+                       <a id="previous" href="javascript:var interaction = new 
Interaction(); interaction.previousTutorial()">Previous</a> | <a id="next" 
href="javascript:var interaction = new Interaction(); 
interaction.nextTutorial()">Next</a>
+               </div>
+
+       </div> <!-- end rules-tutorial -->
+       
+       <div id="rules-syntax" class="title-point">
+               <h3>Rules syntax in BNF</h3>
+               <div id="syntax-body"><@ruleSyntax.view /></div>
+       </div>
+
+</div> <!-- end webview -->
 
-</div>
+<div class="panel" id="restapi" style="display: none;"/>
 
-</div>
 </@common.page>
 </#escape>
\ No newline at end of file

svn commit: r1144199 - in /incubator/stanbol/trunk: ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/static/css/ reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/static/css/ rules/web/src/main/resources/org...

Reply via email to