team4alfanous team mailing list archive
-
team4alfanous team
-
Mailing list archive
-
Message #00039
[Branch ~team4alfanous/alfanous/alfanous-git] Rev 237: many changes in web interface:
------------------------------------------------------------
revno: 237
git commit: 029cf2da00ab6ac52a1435b8d81c2483c1f83917
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Fri 2012-06-08 02:48:56 +0100
message:
many changes in web interface:
* show sajda information in results when available
* make many tags in results click-able and linking to a new search page
based on the tag value. click-able tags: words,sura_name,
theme(chapter,topic,subtopic),aya
stats(nb_letters,nb_words,nb_godnames).
modified:
interfaces/web/wui/css/screen.css
interfaces/web/wui/index.html
--
lp:~team4alfanous/alfanous/alfanous-git
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git
Your team Alfanous team is subscribed to branch lp:~team4alfanous/alfanous/alfanous-git.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription
=== modified file 'interfaces/web/wui/css/screen.css'
--- interfaces/web/wui/css/screen.css 2012-06-05 20:22:37 +0000
+++ interfaces/web/wui/css/screen.css 2012-06-08 01:48:56 +0000
@@ -465,6 +465,50 @@
color: #FFF;
}
+.sura_ord1 {
+ background-color: #888;
+ color: #FFF;
+}
+
+.sura_ord1 {
+ background-color: #888;
+ color: #FFF;
+}
+
+
+.aya_sajda_exist {
+
+ background-color: #E44;
+ color: #FFF;
+
+}
+
+.aya_sajda_id {
+
+ background-color: #C44;
+ color: #FFF;
+
+}
+
+.aya_sajda_type {
+ background-color: #A44;
+ color: #FFF;
+}
+
+.clickable {
+
+ color: #FFF;
+ font-weight: bold;
+ border-style:solid;
+ border-color:#555;
+ border-width:2px;
+}
+
+.no_decoration {
+ text-decoration:none;
+
+}
+
/* Abdellah AD.*/
=== modified file 'interfaces/web/wui/index.html'
--- interfaces/web/wui/index.html 2012-06-06 17:55:19 +0000
+++ interfaces/web/wui/index.html 2012-06-08 01:48:56 +0000
@@ -92,6 +92,14 @@
// }
});
+ function build_search_link(param,query)
+ {
+ var new_param = param;
+ new_param.page = 1;
+ new_param.search = query;
+ return "<a class='no_decoration' href='"+ get_url_without_params()+ "?"+ build_params( new_param )+ "'>"
+ }
+
function get_results (param) {
if ($.trim(param.search) != "") {
$.ajax({
@@ -139,10 +147,7 @@
results += "<div class='details_label word_info0'> كلمة | "+ item[0]+ "</div>";
if (item[1].length) {
$.each(item[1], function(sub_key, sub_item) {
- var param2 = param;
- param2.page = 1;
- param2.search = sub_item;
- results += " <a href='"+ get_url_without_params()+ "?"+ build_params( param2 )+ "'><div class='details_label word_stat1'>"+ sub_item+ "</div></a>";
+ results += build_search_link(param,sub_item) + "<div class='details_label word_stat1 clickable'>"+ sub_item+ "</div></a>";
});
} else {
results += "<div class='details_label word_stat0'> لا مقترحات</div>";
@@ -170,15 +175,18 @@
// Words list
results += "<div id='search_words' align='right'>";
+
results += "<h2 style='font-size:16pt; font-weight:600; color:#ff0000;'>الكلمات :";
results += "<div class='details_label word_count'> الكلمات | "+ json.words["global"].nb_words+ "</div>";
results += "<div class='details_label word_stat0'> مجموع المرات | "+ json.words["global"].nb_matches+ "</div>";
results += "</h2><br />";
+
+
for( i = 1; i <= json.words.global.nb_words; i++) {
results += "<p dir='rtl' style=' margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>";
results += "<div class='word_details'>";
results += "<span style=' font-size:14pt; color:#00aa00;'>"+ i+ ". </span>";
- results += "<div class='details_label word_info0'> كلمة | "+ json.words[i].word+ "</div>";
+ results += build_search_link(param, json.words[i].word) + "<div class='details_label word_info0 clickable'> كلمة | "+ json.words[i].word+ "</div></a>";
results += "<div class='details_label word_stat0'> المرات | "+ json.words[i].nb_matches+ "</div>";
results += "<div class='details_label word_stat1'> الآيات | "+ json.words[i].nb_ayas+ "</div>";
results += "</div></p>";
@@ -191,7 +199,7 @@
// Ayas list
results += "<br /><h2 style=' font-size:15pt; font-weight:600; color:#ff0000;'>النتائج (";
results += json.interval.start+ " إلى "+ json.interval.end+ " من أصل "+ json.interval.total+ " )</h2> <br /> ";
-
+
for( i = json.interval.start; i <= json.interval.end; i++) {
results += "<fieldset class='main_re_item'>";
results += "<legend class='main_re_item_title' style='font-size:14pt;-qt-block-indent:0; text-indent:0px;' dir='rtl'>";
@@ -204,10 +212,11 @@
// results += "<param value='transparent' name='wmode'></object></span><br />";
results += "<span id='audioplayer_"+ i+ "'>(<a href='"+ json.ayas[i].aya.recitation+ "' target='_blank'>تلاوة</a>)</span>";
results += "<div class='sura_details'>";
- results += "<div class='details_label sura_info0'> سورة | "+ json.ayas[i].sura.name+ "</div> ";
+
+ results += build_search_link(param, "سورة:" + json.ayas[i].sura.name) + "<div class='details_label sura_info0 clickable'> سورة | "+ json.ayas[i].sura.name+ "</div></a> ";
results += "<div class='details_label sura_ord0'> رقم | "+ json.ayas[i].sura.id+ "</div>";
results += "<div class='details_label sura_info1'> النوع | "+ json.ayas[i].sura.type+ "</div>";
- results += "<div class='details_label sura_ord1'> ترتيب النزول | "+ json.ayas[i].sura.order+ "</div> ";
+ results += "<div class='details_label sura_ord1'> ترتيب النزول | "+ json.ayas[i].sura.order+ "</div></a>";
results += "<div class='details_label sura_stat0'> الآيات | "+ json.ayas[i].sura.stat.ayas+ "</div> ";
results += "<div class='details_label sura_stat1'> الكلمات | "+ json.ayas[i].sura.stat.words+ " </div>";
results += "<div class='details_label sura_stat2'> الأحرف | "+ json.ayas[i].sura.stat.letters+ "</div>";
@@ -222,19 +231,36 @@
results += "<p dir='ltr' align='center' style=' margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>";
results += "<span style='font-family: \"Droid Sans\", Tahoma, \"Bitstream Vera Sans\", \"DejaVu Sans\", Verdana, Geneva, Arial, Sans-serif; line-height: 150%;'>"+ json.ayas[i].aya.traduction+ "</span></p>";
results += "<br><p align='center' style=' margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>";
- results += "<span style=' color:#808080;'>الفصل : <b>"+ json.ayas[i].theme.chapter+ "</b> ";
- results += "الفرع : <b>"+ json.ayas[i].theme.topic+ "</b> ";
- results += "الباب : <b>"+ json.ayas[i].theme.subtopic+ "</b> </span></p>";
- results += "<div class='aya_details'>";
- results += "<div class='details_label aya_stat0'> الكلمات | "+ json.ayas[i].stat.words+ "</div>";
- results += "<div class='details_label aya_stat1'> الأحرف | "+ json.ayas[i].stat.letters+ "</div>";
- results += "<div class='details_label aya_stat2'> ألفاظ الجلالة | "+ json.ayas[i].stat.godnames+ "</div> ";
+
+ results += "<span style=' color:#808080;'>"
+ if (json.ayas[i].theme.chapter) results += "الفصل : "+ build_search_link(param,"فصل:\"" + json.ayas[i].theme.chapter + "\"" )+ "<b>"+ json.ayas[i].theme.chapter+ "</b></a> ";
+ if (json.ayas[i].theme.topic) results += "الفرع : " + build_search_link(param, "فرع:\"" + json.ayas[i].theme.topic +"\"") +"<b>"+ json.ayas[i].theme.topic+ "</b></a> ";
+ if (json.ayas[i].theme.subtopic) results += "الباب : " + build_search_link(param, "باب:\"" + json.ayas[i].theme.subtopic +"\"") +"<b>"+ json.ayas[i].theme.subtopic+ "</b></a>";
+ results += "</span></p>";
+
+ results += "<div class='aya_details'>";
+ results += build_search_link(param,"ك_آ:" + json.ayas[i].stat.words) + "<div class='details_label aya_stat0 clickable'> الكلمات | "+ json.ayas[i].stat.words+ "</div></a>";
+ results += build_search_link(param,"ح_آ:" + json.ayas[i].stat.letters) + "<div class='details_label aya_stat1 clickable'> الأحرف | "+ json.ayas[i].stat.letters+ "</div></a>";
+ results += build_search_link(param,"ج_آ:" + json.ayas[i].stat.godnames) + "<div class='details_label aya_stat2 clickable'> ألفاظ الجلالة | "+ json.ayas[i].stat.godnames+ "</div></a> ";
results += "<div class='details_label aya_pos0'> المنزل | "+ json.ayas[i].position.manzil+ "</div>";
results += "<div class='details_label aya_pos1'> الحزب | "+ json.ayas[i].position.hizb+ "</div>";
results += "<div class='details_label aya_pos2'> الربع | "+ json.ayas[i].position.rubu+ "</div>";
results += "<div class='details_label aya_pos3'> الصفحة | "+ json.ayas[i].position.page+ "</div>";
- results += "</div><br />";
- results += "</p></fieldset><br /><br />";
+
+
+
+
+ results += "</div><br />";
+ if ( json.ayas[i].sajda.exist == true)
+ {
+ results += "<div>";
+ results += build_search_link(param,"سجدة:نعم") + "<div class='details_label aya_sajda_exist clickable'> سجدة " + "</div></a>";
+ results += "<div class='details_label aya_sajda_id'> رقم | "+ json.ayas[i].sajda.id + "</div>";
+ results += "<div class='details_label aya_sajda_type'> نوع | "+ json.ayas[i].sajda.type + "</div>";
+ results += "</div>"
+ };
+
+ results += "<br /></p></fieldset><br /><br />";
}
