team4alfanous team mailing list archive
-
team4alfanous team
-
Mailing list archive
-
Message #00103
[Branch ~team4alfanous/alfanous/alfanous-git] Rev 294: Merge branch 'master' of git://github.com/zsmahi/alfanous
Merge authors:
zsmahi <zakaria08esi@xxxxxxxxx>
------------------------------------------------------------
revno: 294 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Fri 2012-08-17 18:56:44 +0100
message:
Merge branch 'master' of git://github.com/zsmahi/alfanous
Conflicts:
interfaces/toolbars/chrome/manifest.json
interfaces/toolbars/chrome/search.html
interfaces/toolbars/chrome/search/jquery-1.6.2.min.js
interfaces/toolbars/firefox/chrome/skin/alfanoustoolbar.css
added:
interfaces/toolbars/chrome/README
interfaces/toolbars/firefox/README
interfaces/toolbars/firefox/chrome/skin/icon.png
interfaces/toolbars/firefox/chrome/skin/iphone.jpg
interfaces/toolbars/firefox/chrome/skin/json.gif
interfaces/toolbars/firefox/chrome/skin/mobile.gif
interfaces/toolbars/firefox/chrome/skin/windows.png
interfaces/toolbars/firefox/chrome/skin/wp7.png
interfaces/toolbars/firefox/release/
interfaces/toolbars/firefox/release/alfanoustoolbar.xpi
modified:
interfaces/toolbars/chrome/manifest.json
interfaces/toolbars/chrome/search.html
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
--
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
=== added file 'interfaces/toolbars/chrome/README'
--- interfaces/toolbars/chrome/README 1970-01-01 00:00:00 +0000
+++ interfaces/toolbars/chrome/README 2012-08-17 15:00:51 +0000
@@ -0,0 +1,3 @@
+changes made by zsmahi
+ url in action attribut changed from "http://www.alfanous.org/json"; to "http://www.alfanous.org/";
+ attribut target="_blank" added to show results in new tab // without this attribut results won't be showen
\ No newline at end of file
=== modified file 'interfaces/toolbars/chrome/manifest.json'
--- interfaces/toolbars/chrome/manifest.json 2012-08-17 11:03:41 +0000
+++ interfaces/toolbars/chrome/manifest.json 2012-08-17 17:56:44 +0000
@@ -1,12 +1,10 @@
-{
- "name": "ElFanous",
- "version": "1.0",
- "description": "Elfanous.",
+{
+ "name": "Alfanous",
+ "version": "0.7",
+ "description": "Alfanous.",
"browser_action": {
"default_icon": "logo.png",
"popup": "search.html"
- },
- "permissions": [
- "http://www.alfanous.org/json/";
- ]
-}
\ No newline at end of file
+ },
+ "permissions": ["http://www.alfanous.org/json/";]
+}
=== modified file 'interfaces/toolbars/chrome/search.html'
--- interfaces/toolbars/chrome/search.html 2012-08-17 11:03:41 +0000
+++ interfaces/toolbars/chrome/search.html 2012-08-17 17:56:44 +0000
@@ -139,10 +139,15 @@
<body>
<div id="search_form">
- <form id="form" method="GET" action="http://www.alfanous.org/json";>
+
+ <!--
+ changes made by zsmahi
+ url in action attribut changed from "http://www.alfanous.org/json"; to "http://www.alfanous.org/";
+ attribut target="_blank" added to show results in new tab // without this attribut results won't be showen
+ -->
+ <form id="form" method="GET" action="http://www.alfanous.org/"; target="_blank">
<input dir='rtl' type="text" id="search_box" size="24" name="search" value="الحمد">
-
- <input id="submit" type="submit" value=" بحث في القرآن الكريم" >
+ <input id="submit" type="submit" value=" بحث في القرآن الكريم" >
</form>
</div>
@@ -156,4 +161,4 @@
-</body><span id="skype_highlighting_settings" display="none" autoextractnumbers="1"></span><object id="skype_plugin_object" location.href="http://www.sneetsher.com/abdellah/alfanous_jquery_demo3/"; location.hostname="www.sneetsher.com" style="position: absolute; visibility: hidden; left: -100px; top: -100px; " width="0" height="0" type="application/x-vnd.skype.toolbars.npplugin.4.2.0"></object></html>
\ No newline at end of file
+</body><span id="skype_highlighting_settings" display="none" autoextractnumbers="1"></span><object id="skype_plugin_object" location.href="http://www.sneetsher.com/abdellah/alfanous_jquery_demo3/"; location.hostname="www.sneetsher.com" style="position: absolute; visibility: hidden; left: -100px; top: -100px; " width="0" height="0" type="application/x-vnd.skype.toolbars.npplugin.4.2.0"></object></html>
=== added file 'interfaces/toolbars/firefox/README'
--- interfaces/toolbars/firefox/README 1970-01-01 00:00:00 +0000
+++ interfaces/toolbars/firefox/README 2012-08-17 15:00:51 +0000
@@ -0,0 +1,3 @@
+changes made by zsmahi:
+1- logo for extension added
+2- interfaces added
\ No newline at end of file
=== modified file 'interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.xul'
--- interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.xul 2012-08-06 20:52:45 +0000
+++ interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.xul 2012-08-17 15:00:51 +0000
@@ -143,6 +143,28 @@
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)"
+ class="menuitem-iconic" tooltiptext="Alfanous Arabic version Windows"
+ onclick="AlfanousTB_LoadURL('http://sourceforge.net/projects/alfanous/files/Interfaces/AlfanousDesktop/0.3/alfanousDesktop-windows-0.3ar.exe/download')" />
+
+ <menuitem id="AlfanousTB-Interfaces-WindowsEN" label="Alfanous Windows(English)"
+ class="menuitem-iconic" tooltiptext="Alfanous English version Windows"
+ onclick="AlfanousTB_LoadURL('http://sourceforge.net/projects/alfanous/files/Interfaces/AlfanousDesktop/0.4.20/alfanousDesktop-win0.4r20.exe/download')" />
+
+ <!-- WP7 Interface -->
+
+ <menuitem id="AlfanousTB-Interfaces-WP7" label="Alfanous WP7"
+ class="menuitem-iconic" tooltiptext="use alfanous website from Windows Phone 7"
+ onclick="AlfanousTB_LoadURL('http://www.windowsphone.com/en-US/apps/f9e1504d-ce31-4802-a2d1-24ff9f41a06e')" />
+
+ <!-- Iphone Interface -->
+
+ <menuitem id="AlfanousTB-Interfaces-Iphone" label="Alfanous Iphone"
+ class="menuitem-iconic" tooltiptext="use alfanous website from Iphone"
+ onclick="AlfanousTB_LoadURL('http://itunes.apple.com/us/app/alfanws-mhrk-bhth-qrany-mtqdm/id543646326?mt=8')" />
+
<!-- Non-Official Interfaces; Add a separator -->
<!-- Under Construction -->
=== modified file 'interfaces/toolbars/firefox/chrome/skin/alfanoustoolbar.css'
--- interfaces/toolbars/firefox/chrome/skin/alfanoustoolbar.css 2012-08-08 17:51:29 +0000
+++ interfaces/toolbars/firefox/chrome/skin/alfanoustoolbar.css 2012-08-17 17:56:44 +0000
@@ -26,7 +26,7 @@
/* ResizeBar */
#AlfanousTB-ResizeBar {
- background-image: url("chrome://Alfanoustoolbar/skin/gripper.png");
+ background-image: url("chrome://Alfanoustoolbar/skin/gripper.jpg");
min-height: 22px;
min-width: 3px;
}
@@ -86,3 +86,30 @@
list-style-image: url("chrome://Alfanoustoolbar/skin/gh.png");
}
+
+/* test */
+
+#AlfanousTB-Interfaces-JSON{
+ list-style-image: url("chrome://Alfanoustoolbar/skin/json.gif");
+}
+
+#AlfanousTB-Interfaces-Mobile{
+ list-style-image: url("chrome://Alfanoustoolbar/skin/mobile.gif");
+}
+
+#AlfanousTB-Interfaces-WindowsAR{
+ list-style-image: url("chrome://Alfanoustoolbar/skin/windows.png");
+}
+
+#AlfanousTB-Interfaces-WindowsEN{
+ list-style-image: url("chrome://Alfanoustoolbar/skin/windows.png");
+}
+
+#AlfanousTB-Interfaces-WP7{
+ list-style-image: url("chrome://Alfanoustoolbar/skin/wp7.png");
+}
+
+#AlfanousTB-Interfaces-Iphone{
+ list-style-image: url("chrome://Alfanoustoolbar/skin/iphone.jpg");
+}
+
=== added file 'interfaces/toolbars/firefox/chrome/skin/icon.png'
Binary files interfaces/toolbars/firefox/chrome/skin/icon.png 1970-01-01 00:00:00 +0000 and interfaces/toolbars/firefox/chrome/skin/icon.png 2012-08-17 15:00:51 +0000 differ
=== added file 'interfaces/toolbars/firefox/chrome/skin/iphone.jpg'
Binary files interfaces/toolbars/firefox/chrome/skin/iphone.jpg 1970-01-01 00:00:00 +0000 and interfaces/toolbars/firefox/chrome/skin/iphone.jpg 2012-08-17 15:00:51 +0000 differ
=== added file 'interfaces/toolbars/firefox/chrome/skin/json.gif'
Binary files interfaces/toolbars/firefox/chrome/skin/json.gif 1970-01-01 00:00:00 +0000 and interfaces/toolbars/firefox/chrome/skin/json.gif 2012-08-17 15:00:51 +0000 differ
=== added file 'interfaces/toolbars/firefox/chrome/skin/mobile.gif'
Binary files interfaces/toolbars/firefox/chrome/skin/mobile.gif 1970-01-01 00:00:00 +0000 and interfaces/toolbars/firefox/chrome/skin/mobile.gif 2012-08-17 15:00:51 +0000 differ
=== modified file 'interfaces/toolbars/firefox/chrome/skin/search.png'
Binary files interfaces/toolbars/firefox/chrome/skin/search.png 2012-08-06 20:52:45 +0000 and interfaces/toolbars/firefox/chrome/skin/search.png 2012-08-17 15:00:51 +0000 differ
=== added file 'interfaces/toolbars/firefox/chrome/skin/windows.png'
Binary files interfaces/toolbars/firefox/chrome/skin/windows.png 1970-01-01 00:00:00 +0000 and interfaces/toolbars/firefox/chrome/skin/windows.png 2012-08-17 15:00:51 +0000 differ
=== added file 'interfaces/toolbars/firefox/chrome/skin/wp7.png'
Binary files interfaces/toolbars/firefox/chrome/skin/wp7.png 1970-01-01 00:00:00 +0000 and interfaces/toolbars/firefox/chrome/skin/wp7.png 2012-08-17 15:00:51 +0000 differ
=== modified file 'interfaces/toolbars/firefox/install.rdf'
--- interfaces/toolbars/firefox/install.rdf 2012-08-08 17:51:29 +0000
+++ interfaces/toolbars/firefox/install.rdf 2012-08-17 17:56:44 +0000
@@ -22,7 +22,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>1.5</em:minVersion>
- <em:maxVersion>20.*</em:maxVersion>
+ <em:maxVersion>25.*</em:maxVersion>
</Description>
</em:targetApplication>
@@ -31,6 +31,7 @@
<em:creator>Zakaria SMAHI</em:creator>
<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>
=== modified file 'interfaces/toolbars/firefox/make.sh'
--- interfaces/toolbars/firefox/make.sh 2012-08-08 17:51:29 +0000
+++ interfaces/toolbars/firefox/make.sh 2012-08-17 17:56:44 +0000
@@ -4,7 +4,7 @@
# make file
-# created on Sunday, August 05th, 2012 at 13:00
+# created on Wednsday, August 15th, 2012 at 13:00
# by SMAHI Zakaria
# zakaria08esi@xxxxxxxxx
=== added directory 'interfaces/toolbars/firefox/release'
=== added file 'interfaces/toolbars/firefox/release/alfanoustoolbar.xpi'
Binary files interfaces/toolbars/firefox/release/alfanoustoolbar.xpi 1970-01-01 00:00:00 +0000 and interfaces/toolbars/firefox/release/alfanoustoolbar.xpi 2012-08-17 15:00:51 +0000 differ
