team4alfanous team mailing list archive
-
team4alfanous team
-
Mailing list archive
-
Message #00254
[Branch ~team4alfanous/alfanous/alfanous-git] Rev 441: Merge branch 'master' into new_output_english_wui
Merge authors:
Assem Chelli (عاصم شلي) (assem-ch)
------------------------------------------------------------
revno: 441 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Thu 2012-11-22 00:52:24 +0100
message:
Merge branch 'master' into new_output_english_wui
modified:
interfaces/web/wui/index.html
src/alfanous/configs/recitations.json
--
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/web/wui/index.html'
--- interfaces/web/wui/index.html 2012-11-21 23:49:34 +0000
+++ interfaces/web/wui/index.html 2012-11-21 23:52:24 +0000
@@ -22,6 +22,9 @@
<link rel="search" type="application/opensearchdescription+xml" title="Alfanous" href="http://wui.alfanous.org/alfanous-opensearch.xml"/>
<link rel="search" type="application/opensearchdescription+xml" title="Alfanous Mobile" href="http://wui.alfanous.org/alfanous-mobile-opensearch.xml"/>
+ <!-- G+ direct connect -->
+ <link href="https://plus.google.com/u/0/111305625425237630318" rel="publisher" />
+
<!--fb-->
<meta property="og:image" content="http://wui.alfanous.org/images/logo_fb.png" />
@@ -557,7 +560,7 @@
<table>
<tr>
<td colspan="4" style="background:url(images/logo.png); width:395px; height:209px;"> </td>
- </tr>
+ </tr>
<tr>
<td style="background:url(images/main_table_02.png) no-repeat;width:50px;height:26px"> </td>
<td style="background:url(images/main_table_03.png) no-repeat;width:259px;height:26px">
@@ -581,7 +584,6 @@
</div>
-
<div class="follow-box" >
<a class="twitter_share" target='_blank' rel='nofollow' href='http://twitter.com/home?status=http://www.alfanous.org%20Alfanous%20|%20Advanced%20Quranic%20Search%20Engine'><img src='images/twitter.png' class='bo' alt='twitter' title='Twitter'/></a><br/>
<a class="facebook_share" target='_blank' rel='nofollow' href='http://www.facebook.com/share.php?u=http://www.alfanous.org%26t=Alfanous%20|%20Advanced%20Quranic%20Search%20Engine'><img class='bo' alt='Facebook' title='Facebook' src='images/facebook.png' /></a><br/>
=== modified file 'src/alfanous/configs/recitations.json'
--- src/alfanous/configs/recitations.json 2012-06-23 18:35:53 +0000
+++ src/alfanous/configs/recitations.json 2012-11-21 14:47:21 +0000
@@ -336,8 +336,8 @@
"bitrate":"128kbps"
},
"45":{
- "subfolder":"English\/Ibrahim_Walk_192kbps_TEST",
- "name":"English\/Ibrahim Walk TEST",
+ "subfolder":"English\/Sahih_Intnl_Ibrahim_Walk_192kbps",
+ "name":"(English) Translated by Sahih International Recited by Ibrahim Walk",
"bitrate":"192kbps"
},
"46":{
@@ -384,5 +384,55 @@
"subfolder":"Salah_Al_Budair_128kbps",
"name":"Salah Al Budair",
"bitrate":"128kbps"
- }
+ },
+ "55":{
+ "subfolder":"Abdullah_Matroud_128kbps",
+ "name":"Abdullah Matroud",
+ "bitrate":"128kbps"
+ },
+ "56":{
+ "subfolder":"Ahmed_Neana_128kbps",
+ "name":"Ahmed Neana",
+ "bitrate":"128kbps"
+ },
+ "57":{
+ "subfolder":"Muhammad_AbdulKareem_128kbps",
+ "name":"Muhammad AbdulKareem",
+ "bitrate":"128kbps"
+ },
+ "58":{
+ "subfolder":"khalefa_al_tunaiji_64kbps",
+ "name":"Khalefa Al-Tunaiji",
+ "bitrate":"64kbps"
+ },
+ "59":{
+ "subfolder":"mahmoud_ali_al_banna_32kbps",
+ "name":"Mahmoud Ali Al-Banna",
+ "bitrate":"32kbps"
+ },
+ "60":{
+ "subfolder":"warsh\/warsh_ibrahim_aldosary_128kbps",
+ "name":"(Warsh) Ibrahim Al-Dosary",
+ "bitrate":"128kbps"
+ },
+ "61":{
+ "subfolder":"warsh\/warsh_yassin_al_jazaery_64kbps",
+ "name":"(Warsh) Yassin Al-Jazaery",
+ "bitrate":"64kbps"
+ },
+ "62":{
+ "subfolder":"warsh\/warsh_Abdul_Basit_128kbps",
+ "name":"(Warsh) Abdul Basit",
+ "bitrate":"128kbps"
+ },
+ "63":{
+ "subfolder":"translations/urdu_shamshad_ali_khan_46kbps",
+ "name":"(Urdu) Shamshad Ali Khan",
+ "bitrate":"46kbps"
+ },
+ "64":{
+ "subfolder":"Karim_Mansoori_40kbps",
+ "name":"Karim Mansoori (Iran)",
+ "bitrate":"40kbps"
+ }
}