incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From piergior...@apache.org
Subject svn commit: r1238716 - in /incubator/lcf/trunk: ./ connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/
Date Tue, 31 Jan 2012 17:56:37 GMT
Author: piergiorgio
Date: Tue Jan 31 17:56:37 2012
New Revision: 1238716

URL: http://svn.apache.org/viewvc?rev=1238716&view=rev
Log:
- updated the CMIS Connector UI removing Javascript code with Apache Velocity directives
- updated the Japanese templates of the CMIS Connector with the latest changes

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_en_US.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_ja_JP.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_en_US.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_ja_JP.html

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1238716&r1=1238715&r2=1238716&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Tue Jan 31 17:56:37 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-395: CMIS Connector UI must be completely conformed with Apache Velocity
+(Piergiorgio Lucidi)
+
 CONNECTORS-392: Complete translation to Japanese of index.xml and
 concepts.xml.
 (Hitoshi Ozawa)

Modified: incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html?rev=1238716&r1=1238715&r2=1238716&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
(original)
+++ incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
Tue Jan 31 17:56:37 2012
@@ -29,12 +29,13 @@
     </td>
     <td class="value">
       <select id="binding" name="binding">
-        <option value="atom" selected="selected">
-          AtomPub
-        </option>
-        <option value="ws">
-          Web Services
-        </option>
+      #if($BINDING_BJ == "atom")
+        <option value="atom" selected="selected">AtomPub</option>
+        <option value="ws">Web Services</option>
+      #else
+        <option value="atom">AtomPub</option>
+        <option value="ws" selected="selected">Web Services</option>
+      #end
       </select>
     </td>
   </tr>
@@ -66,8 +67,13 @@
     </td>
     <td class="value">
       <select id="protocol" name="protocol">
+      #if($PROTOCOL_BJ == "https")
         <option value="http">http</option>
+        <option value="https" selected="selected">https</option>
+      #else
+        <option value="http" selected="selected">http</option>
         <option value="https">https</option>
+      #end
       </select>
     </td>
   </tr>
@@ -114,24 +120,4 @@
       </nobr>
     </td>
   </tr>
-</table>
-
-<script type="text/javascript">
-<!--
-var binding = "$BINDING_BJ";
-var bindingSelect = editconnection.binding;
-if(binding==bindingSelect.options[1].value){
-  bindingSelect.options[1].selected = true;
-} else if (binding==bindingSelect.options[0].value){
-  bindingSelect.options[0].selected = true;
-}
-
-var protocol = "$PROTOCOL_BJ";
-var protocolSelect = editconnection.protocol;
-if(protocol==protocolSelect.options[1].value){
-  protocolSelect.options[1].selected = true;
-} else if (protocol == protocolSelect.options[0].value){
-  protocolSelect.options[0].selected = true;
-}
-//-->
-</script>
\ No newline at end of file
+</table>
\ No newline at end of file

Modified: incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html?rev=1238716&r1=1238715&r2=1238716&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
(original)
+++ incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
Tue Jan 31 17:56:37 2012
@@ -29,12 +29,13 @@
 		</td>
 		<td class="value">
 			<select id="binding" name="binding">
-				<option value="atom" selected="selected">
-					AtomPub
-				</option>
-				<option value="ws">
-					Web Services
-				</option>
+		  #if($BINDING_BJ == "atom")
+        <option value="atom" selected="selected">AtomPub</option>
+        <option value="ws">Web Services</option>
+      #else
+        <option value="atom">AtomPub</option>
+        <option value="ws" selected="selected">Web Services</option>
+      #end
 			</select>
 		</td>
 	</tr>
@@ -59,15 +60,53 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="description">
-			<nobr>
-				エンドポイント:
-			</nobr>
-		</td>
-		<td class="value">
-			<input type="text" name="endpoint" value="$ENDPOINT_A" size="50" />
-		</td>
-	</tr>
+    <td class="description">
+      <nobr>
+        Protocol:
+      </nobr>
+    </td>
+    <td class="value">
+      <select id="protocol" name="protocol">
+      #if($PROTOCOL_BJ == "https")
+        <option value="http">http</option>
+        <option value="https" selected="selected">https</option>
+      #else
+        <option value="http" selected="selected">http</option>
+        <option value="https">https</option>
+      #end
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      <nobr>
+        Server:
+      </nobr>
+    </td>
+    <td class="value">
+        <input id="server" name="server" type="text" size="32" value="$SERVER_A"/>
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      <nobr>
+        Port:
+      </nobr>
+    </td>
+    <td class="value">
+        <input id="port" name="port" type="text" size="5" value="$PORT_A" />
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      <nobr>
+        Path:
+      </nobr>
+    </td>
+    <td class="value">
+        <input id="path" name="path" type="text" size="32" value="$PATH_A" />
+    </td>
+  </tr>
 	<tr>
 		<td class="description">
 			<nobr>
@@ -75,30 +114,10 @@
 			</nobr>
 		</td>
 		<td class="value">
-			<input type="text" id="repositoryId" name="repositoryId" value="REPOSITORYID_A" />
+			<input type="text" id="repositoryId" name="repositoryId" value="$REPOSITORYID_A" />
 			<nobr>
 				(任意)
 			</nobr>
 		</td>
 	</tr>
-</table>
-
-<script type="text/javascript">
-<!--
-var binding = "$BINDING_BJ";
-var bindingSelect = editconnection.binding;
-if(binding==bindingSelect.options[1].value){
-  bindingSelect.options[1].selected = true;
-} else if (binding==bindingSelect.options[0].value){
-  bindingSelect.options[0].selected = true;
-}
-
-var protocol = "$PROTOCOL_BJ";
-var protocolSelect = editconnection.protocol;
-if(protocol==protocolSelect.options[1].value){
-  protocolSelect.options[1].selected = true;
-} else if (protocol == protocolSelect.options[0].value){
-  protocolSelect.options[0].selected = true;
-}
-//-->
-</script>
+</table>
\ No newline at end of file

Modified: incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_en_US.html?rev=1238716&r1=1238715&r2=1238716&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_en_US.html
(original)
+++ incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_en_US.html
Tue Jan 31 17:56:37 2012
@@ -24,7 +24,7 @@
     </td>
     <td class="value" colspan="3">
       <nobr>
-        username=$USERNAME:B
+        username=$USERNAME_B
       </nobr>
       <br />
       <nobr>
@@ -32,27 +32,27 @@
       </nobr>
       <br />
       <nobr>
-        binding=$BINDING:B
+        binding=$BINDING_B
       </nobr>
       <br />
       <nobr>
-        protocol=$PROTOCOL:B
+        protocol=$PROTOCOL_B
       </nobr>
       <br />
       <nobr>
-        server=$SERVER:B
+        server=$SERVER_B
       </nobr>
       <br />
       <nobr>
-        port=$PORT:B
+        port=$PORT_B
       </nobr>
       <br />
       <nobr>
-        path=$PATH:B
+        path=$PATH_B
       </nobr>
       <br />
       <nobr>
-        repositoryId=$REPOSITORYID:B
+        repositoryId=$REPOSITORYID_B
       </nobr>
       <br />
     </td>

Modified: incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_ja_JP.html?rev=1238716&r1=1238715&r2=1238716&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_ja_JP.html
(original)
+++ incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_ja_JP.html
Tue Jan 31 17:56:37 2012
@@ -24,7 +24,7 @@
 		</td>
 		<td class="value" colspan="3">
 			<nobr>
-				ユーザ名=${USERNAME:B}
+				ユーザ名=$USERNAME_B
 			</nobr>
 			<br />
       <nobr>
@@ -32,17 +32,29 @@
       </nobr>
 			<br />
 			<nobr>
-				バイディング=${BINDING:B}
+				バイディング=$BINDING_B
 			</nobr>
 			<br />
-			<nobr>
-				エンドポイント=${ENDPOINT:B}
-			</nobr>
+      <nobr>
+        protocol=$PROTOCOL_B
+      </nobr>
+      <br />
+      <nobr>
+        server=$SERVER_B
+      </nobr>
+      <br />
+      <nobr>
+        port=$PORT_B
+      </nobr>
+      <br />
+      <nobr>
+        path=$PATH_B
+      </nobr>
 			<br />
       <nobr>
-        repositoryId=${REPOSITORYID:B}
+        repositoryId=$REPOSITORYID_B
       </nobr>
       <br />
 		</td>
 	</tr>
-</table>
+</table>
\ No newline at end of file

Modified: incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_en_US.html?rev=1238716&r1=1238715&r2=1238716&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_en_US.html
(original)
+++ incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_en_US.html
Tue Jan 31 17:56:37 2012
@@ -21,7 +21,7 @@
       CMIS Query:
     </td>
     <td class="value">
-      $CMISQUERY:B
+      $CMISQUERY_B
     </td>
   </tr>
 </table>

Modified: incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_ja_JP.html?rev=1238716&r1=1238715&r2=1238716&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_ja_JP.html
(original)
+++ incubator/lcf/trunk/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_ja_JP.html
Tue Jan 31 17:56:37 2012
@@ -21,7 +21,7 @@
 			CMISクエリー:
 		</td>
 		<td class="value">
-			${CMISQUERY:B}
+			$CMISQUERY_B
 		</td>
 	</tr>
 </table>



Mime
View raw message