No commit message

zylklab · Dec 17, 2013 · 4aab443 · 4aab443
1 parent 126e384
commit 4aab443
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 92 deletions.
diff --git a/META-INF/components/online-edition/zk-online-edition-actions-min.js b/META-INF/components/online-edition/zk-online-edition-actions-min.js
diff --git a/META-INF/components/online-edition/zk-online-edition-actions.js b/META-INF/components/online-edition/zk-online-edition-actions.js
@@ -3,20 +3,12 @@
     {
         actionName: "onActionZKEditOnline",
         fn: function ZK_onActionZKEditOnline(file) {
-
-        	var webdavPath = "";
-        	//if(navigator.userAgent.search("Firefox") >= 0){
-          	  var davProtocol = "dav";
-          	  if(window.location.protocol.indexOf("https") != -1){
-        		  davProtocol = "davs";
-        	    }
-          	  webdavPath = davProtocol+"://"+ window.location.host + "/alfresco"+ file.webdavUrl;
-          //  }else {
-          //  	webdavPath = window.location.protocol+"//"+ window.location.host + "/alfresco"+ file.webdavUrl;
-          //  }
-
-
+                var davProtocol = "dav";
+                if(window.location.protocol.indexOf("https") != -1){
+                  davProtocol = "davs";
+        	}
+          	webdavPath = davProtocol+"://"+ window.location.host + "/alfresco"+ file.webdavUrl;
         	window.location = webdavPath;
         }
     });
-})();
+})();
diff --git a/META-INF/share-config-custom.xml b/META-INF/share-config-custom.xml
diff --git a/alfresco/messages/zk-online-edition_eu.properties b/alfresco/messages/zk-online-edition_eu.properties
@@ -0,0 +1 @@
+zk.label.online.edition=Edit. Online
diff --git a/alfresco/web-extension/zk-online-edition-config-custom.xml b/alfresco/web-extension/zk-online-edition-config-custom.xml
@@ -0,0 +1,34 @@
+<alfresco-config>
+
+	<config evaluator="string-compare" condition="DocLibCustom">   
+      <dependencies> 
+            	<js src="components/online-edition/zk-online-edition-actions.js" />
+      </dependencies> 
+    </config>
+
+
+	 <config evaluator="string-compare" condition="DocLibActions">
+		<actions>
+			<action id="zk-online-edition" type="javascript"
+				label="zk.label.online.edition" icon="document-edit-online">				
+				<param name="function">onActionZKEditOnline</param>				
+				<permissions>
+               		<permission allow="true">Write</permission>
+            	</permissions>
+				<evaluator>zk.evaluator.doclib.action.onlineEditMimetype</evaluator>
+			</action>
+		</actions>
+
+		<actionGroups>
+			<actionGroup id="document-browse">
+				<action index="105" id="zk-online-edition" />
+			</actionGroup>
+			<actionGroup id="document-details">
+				<action index="105" id="zk-online-edition" />
+			</actionGroup>
+
+		</actionGroups>
+
+	</config>
+
+</alfresco-config>   
diff --git a/org/springframework/extensions/surf/zk-online-edition-context.xml b/org/springframework/extensions/surf/zk-online-edition-context.xml
@@ -42,6 +42,16 @@
       </property>
 
    </bean>
+
+   	<bean id="zk-online-edition.config.bootstrap" class="org.springframework.extensions.config.ConfigBootstrap"
+		init-method="register" depends-on="webframework.configsource">
+		<property name="configService" ref="web.config" />
+		<property name="configs">
+			<list>
+				<value>classpath:alfresco/web-extension/zk-online-edition-config-custom.xml</value>
+			</list>
+		</property>
+	</bean>
 
 
 </beans>