team4alfanous team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  zsmahi <zakaria08esi@xxxxxxxxx>
------------------------------------------------------------
revno: 329 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Wed 2012-09-05 22:20:44 +0100
message:
  Merge branch 'master' of ssh://git.code.sf.net/p/alfanous/code
  
  Conflicts:
  	interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.js
  	interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.xul
  	interfaces/toolbars/firefox/chrome/skin/alfanoustoolbar.css
  	interfaces/toolbars/firefox/chrome/skin/search.png
  	interfaces/toolbars/firefox/install.rdf
  	interfaces/toolbars/firefox/make.sh
modified:
  interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.js
  interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.xul
  interfaces/toolbars/firefox/chrome/skin/alfanoustoolbar.css
  interfaces/toolbars/firefox/install.rdf
  interfaces/toolbars/firefox/make.sh


--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git

Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription

=== modified file 'interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.js'
--- interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.js	2012-08-31 11:14:14 +0000
+++ interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.js	2012-09-05 21:20:44 +0000
@@ -4,6 +4,7 @@
 	by SMAHI Zakaria
 	zakaria08esi@xxxxxxxxx
 */
+
 /*
 TODO  LIST
 	# open  links in  new tab instead of getting last browser window  ......... done
@@ -164,6 +165,7 @@
 		var numItemsToAdd = 10;
 
 		tempItem.setAttribute("label", "allah");
+
 		for(var i=0; i<numItemsToAdd; i++)
 		{
 			// Create a new menu item to be added
@@ -177,4 +179,3 @@
 		}
 
 	} 
-

=== modified file 'interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.xul'
--- interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.xul	2012-08-31 11:14:14 +0000
+++ interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.xul	2012-09-05 21:20:44 +0000
@@ -7,13 +7,14 @@
 	zakaria08esi@xxxxxxxxx
 							-->
 
-							
+				
 <!-- 
 	TODO  LIST
 	# use textbox instead of toolbaritem id="AlfanousTB-SearchTerms-TBItem"
 	# enable search history and autocomplete in textbox
 							-->							
 							
+
 <!-- css sheet used -->
 
 <?xml-stylesheet href="chrome://alfanoustoolbar/skin/alfanoustoolbar.css" type="text/css"?>
@@ -150,6 +151,7 @@
 						class="menuitem-iconic" tooltiptext="use alfanous website from mobile"
 						onclick="AlfanousTB_LoadURL('mobile.alfanous.org')" />
 
+
 					<!-- Desktop Version -->
 
 					<menuitem id="AlfanousTB-Interfaces-WindowsAR" label="Alfanous Windows(Arabic)"

=== modified file 'interfaces/toolbars/firefox/chrome/skin/alfanoustoolbar.css'
--- interfaces/toolbars/firefox/chrome/skin/alfanoustoolbar.css	2012-08-17 17:56:44 +0000
+++ interfaces/toolbars/firefox/chrome/skin/alfanoustoolbar.css	2012-09-05 21:20:44 +0000
@@ -113,3 +113,4 @@
 	list-style-image: url("chrome://Alfanoustoolbar/skin/iphone.jpg");
 }
 
+

=== modified file 'interfaces/toolbars/firefox/install.rdf'
--- interfaces/toolbars/firefox/install.rdf	2012-08-19 03:36:08 +0000
+++ interfaces/toolbars/firefox/install.rdf	2012-09-05 21:20:44 +0000
@@ -33,7 +33,6 @@
 		<em:description>ALFANOUS Toolbar: search easily in Holy Quran</em:description>
 		<em:homepageURL>http://alfanous.org/</em:homepageURL>
 		<em:iconURL>chrome://alfanoustoolbar/skin/icon.png</em:iconURL>
-
 	</Description>
 
 </RDF> 

=== modified file 'interfaces/toolbars/firefox/make.sh'
--- interfaces/toolbars/firefox/make.sh	2012-08-17 17:56:44 +0000
+++ interfaces/toolbars/firefox/make.sh	2012-09-05 21:20:44 +0000
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-
-
-
 # 	make file 
 #	created on Wednsday, August 15th, 2012 at 13:00
 #	by SMAHI Zakaria