← Back to team overview

openerp-dev-web team mailing list archive

  1. openerp-dev-web team
  2. Mailing list archive
  3. Message #01358

[Merge] lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

  Thread Previous • Date Previous • • Thread Next 
jam-openerp has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP Core Team (openerp)


Hello
    I have improved the license of the thunder bird plugin after discussing with hmo sir and xrg sir, kindly review it.

Thank You
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/44006
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons1.

=== modified file 'thunderbird/plugin/openerp_plugin.xpi'
Binary files thunderbird/plugin/openerp_plugin.xpi	2010-12-10 13:30:34 +0000 and thunderbird/plugin/openerp_plugin.xpi	2010-12-17 05:21:17 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	2010-12-10 13:30:34 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	2010-12-17 05:21:17 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js' (properties changed: +x to -x)
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul' (properties changed: +x to -x)
--- thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul	2010-10-05 09:06:50 +0000
+++ thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul	2010-12-17 05:21:17 +0000
@@ -4,7 +4,7 @@
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 	xmlns:html="http://www.w3.org/1999/xhtml";
-	title="&title.label;" onload="myPrefObserver.register();myPrefObserver.webregister();"  unload="myPrefObserver.unregister()" height="410" width="900">
+	title="&title.label;" onload="myPrefObserver.register();myPrefObserver.webregister();"  unload="myPrefObserver.unregister()" height="430" width="900">
 <script type="text/javascript" src="chrome://openerp_plugin/content/tiny_xmlrpc.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/config.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/loaddata.js"></script>
@@ -16,20 +16,20 @@
     <tab label="About"/>
   </tabs>
   <tabpanels>
-    <tabpanel id="configtab">
-    	<vbox style="border:1px solid black">
-	      	<groupbox id="gpConnection" align ="center" >
- <separator class="groove-thin" orient="horizontal" width="94"/> 
-			  <caption label="&gpConnection.label;"/>
+    <tabpanel id="configtab">
+    	<vbox style="border:1px solid black">
+	      	<groupbox id="gpConnection" align ="center" >
+ <separator class="groove-thin" orient="horizontal" width="94"/> 
+			  <caption label="&gpConnection.label;"/>
 				<hbox>
 					<label  align="right" id="url"  value="&txturl.label;" width="80" />
 					<textbox id="txturl" width="200" readonly="true" />
 					<button label="&getdblist.label;" oncommand="openConfigChange();" image="&imagesearch.value;" width="90"/>
-				</hbox>
+				</hbox>
 				<hbox align="center" id="database_option">
 				</hbox>
 				<hbox id="first">
-					<label align="right" id="lbldb_list1" control="DBlist" value="&database.label;" width="80"/> 
+					<label align="right" id="lbldb_list1" control="DBlist" value="&database.label;" width="80"/> 
 					<textbox id="DBlist_text" width="300"/>
 				</hbox>
 
@@ -43,33 +43,33 @@
 				</hbox>
 				<hbox >
 					<spacer width="290"/>
-					<button align="center" id="btconnection" label="&connection.label;" oncommand="testConnection();" image="&imageok.value;" width="100"/>
-				</hbox>
+					<button align="center" id="btconnection" label="&connection.label;" oncommand="testConnection();" image="&imageok.value;" width="100"/>
+				</hbox>
                 <separator class="groove-thin" orient="horizontal" width="94"/> 
-			</groupbox>
-		</vbox>
-
-        <separator class="groove-thin" orient="horizontal" width="10"/> 
-        <vbox style="border:1px solid black" width="94">
-      <groupbox id="webgroup" > 
-        <vbox>
-         <caption label="&webConnection.label;"/>
-        </vbox>
-        <separator class="groove-thin" orient="horizontal" width="10"/> 
-        <hbox>
+			</groupbox>
+		</vbox>
+
+        <separator class="groove-thin" orient="horizontal" width="10"/> 
+        <vbox style="border:1px solid black" width="94">
+      <groupbox id="webgroup" > 
+        <vbox>
+         <caption label="&webConnection.label;"/>
+        </vbox>
+        <separator class="groove-thin" orient="horizontal" width="10"/> 
+        <hbox>
         <label  align="right" id="url"  value="&txtweburl.label;" width="80" />
-		<textbox id="txtweburl" width="200" readonly="true"/>
-        </hbox>
-     
+		<textbox id="txtweburl" width="200" readonly="true"/>
+        </hbox>
+     
         <hbox >
 		    <spacer width="113"/>
-		    <button align="center" id="websetconnection" label="&setconnection.label;" oncommand="openConfigChangeweb();" image="&imagesearch.value;"/>
-         <button align="center" id="webopenconnection" label="&openconnection.label;" oncommand="testConnection_web();" image="&imageok.value;"/>
-		</hbox>
-</groupbox>  
- </vbox>
-    </tabpanel>
- 
+		    <button align="center" id="websetconnection" label="&setconnection.label;" oncommand="openConfigChangeweb();" image="&imagesearch.value;"/>
+         <button align="center" id="webopenconnection" label="&openconnection.label;" oncommand="testConnection_web();" image="&imageok.value;"/>
+		</hbox>
+</groupbox>  
+ </vbox>
+    </tabpanel>
+ 
     <tabpanel id="objecttab">
 		<groupbox id="gpObject" width="700" >
 		<caption label="&listDocument.header;"/>
@@ -88,7 +88,7 @@
                         <button id="btobjectdelete" label="&documentdelete.label;" oncommand="deleteDocument();" image="&imagecancel.value;"/>
 					</hbox>
 					
-					<listbox id="listObjectListBox" flex="1" rows="10">
+					<listbox id="listObjectListBox" flex="1" rows="12">
 				        <listhead>
 						<listheader label="Title"/>
 				        	<listheader label="&listDocumentListBox.header;"/>
@@ -110,20 +110,24 @@
     <tabpanel id="abouttab">
 		<groupbox id="gpAbout" width="770" align="center">
 			<caption label="&gpAbout.label;"/>
+			<description>&openerp.paresent;</description>
+			<image src="chrome://openerp_plugin/skin/logo.png" sizemode="stretch" align="center"/>
+
+			<description> </description>
+			<description> </description>
+			<description>&develop.value;</description>
 			<image src="chrome://openerp_plugin/skin/developped_by.png" sizemode="stretch" align="center"/>
 			<description> </description>
 			<description> </description>
-			<description>&develop.value;</description>
-			<description> </description>
-			<description> </description>
 			<description>&information.value;</description>
 			<description><html:a href="&openerp.value;">&openerp.value;</html:a></description>
+			
 			<description><html:a href="&axelor.value;">&axelor.value;</html:a></description>
 			<description><html:a href="&tinyerp.value;">&tinyerp.value;</html:a></description>
 			<description> </description>
 			<description> </description>
 			<description>Copyright © 2006-TODAY OpenERP SA All Rights Reserved.</description>
-			<description>OpenERP is a trademark of the OpenERP SA Company. OpenERP Web is jointly developed by OpenERP SA and Axelor.</description>
+			<description>OpenERP is a trademark of the OpenERP SA Company. OpenERP Web is jointly developed by OpenERP SA &amp; Axelor.</description>
 			<description>Licenced under the terms of <html:a href="https://tiny.odoo.com/LICENSE.txt";> OpenERP Public License (OEPL) v1.1 (https://tiny.odoo.com/LICENSE.txt)</html:a> </description>
 		</groupbox>
     </tabpanel>

=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/loaddata.js' (properties changed: +x to -x)
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js' (properties changed: +x to -x)
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul' (properties changed: +x to -x)
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js' (properties changed: +x to -x)
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd' (properties changed: +x to -x)
--- thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd	2010-10-05 08:46:43 +0000
+++ thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd	2010-12-17 05:21:17 +0000
@@ -1,13 +1,13 @@
 <!ENTITY title.label "OpenERP Configuration">
 <!ENTITY separate.label "Configuration Login for OpenERP!">
 <!ENTITY close.label "Close">
-<!ENTITY database.label "Database:">
+<!ENTITY database.label "Database:">
 <!ENTITY ok.label "OK">
-<!ENTITY connection.label "Connect">
-<!ENTITY setconnection.label "Change">
+<!ENTITY connection.label "Connect">
+<!ENTITY setconnection.label "Change">
 <!ENTITY openconnection.label "Open">
-<!ENTITY txturl.label "Server: ">
-<!ENTITY txtweburl.label "Server: ">
+<!ENTITY txturl.label "Server: ">
+<!ENTITY txtweburl.label "Server: ">
 <!ENTITY txtwebport.label "Port: ">
 <!ENTITY image.label "Image : ">
 <!ENTITY obj.label "Document : ">
@@ -15,7 +15,7 @@
 <!ENTITY password.label "Password: ">
 <!ENTITY setdb.label "Move &gt;">
 <!ENTITY getdblist.label "Change">
-<!ENTITY gpConnection.label "Connection Parameters">
+<!ENTITY gpConnection.label "Connection Parameters">
 <!ENTITY webConnection.label "Webserver Parameters">
 <!ENTITY listDBListBox.header "Available DBs">
 <!ENTITY listDocument.header "Document">
@@ -35,13 +35,15 @@
 <!ENTITY axelor.value "http://www.axelor.com";>
 <!ENTITY tinyerp.value "http://tiny.be/";>
 
+<!ENTITY openerp.paresent "This Thunderbird Plugin for OpenERP presently (2010-today) developed by OpenERP SA.">
+
 <!ENTITY openerp_s.value "OpenERP">
 <!ENTITY axelor_s.value "The Axelor Company">
 <!ENTITY tinyerp_s.value "The Tiny Company">
 
 <!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
 <!ENTITY gpAbout.label "About OpenERP Thunderbird Plugin">
-<!ENTITY develop.value "This Thunderbird Plugin for OpenERP has been developed by OpenERP SA &amp; Axelor">
+<!ENTITY develop.value "Based on original work, copyright 2003-2009, by Tiny &amp; Axelor ">
 <!ENTITY information.value "For more information, please visit our website">
 <!ENTITY contact.label "Contact Us">
 <!ENTITY contact.value "info@xxxxxxxxxx">

=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd' (properties changed: +x to -x)
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png	2010-12-08 12:16:15 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png	2010-12-17 05:21:17 +0000 differ
=== added file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/logo.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/logo.png	1970-01-01 00:00:00 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/logo.png	2010-12-17 05:21:17 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/overlay.css' (properties changed: +x to -x)

Follow ups

  Thread Previous • Date Previous • • Thread Next