From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:28 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:28 +0000 Subject: [Debian-islamic-commits] [thawab] branch master updated (068547c -> 9197b25) Message-ID: <20170606080427.9227.2466@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a change to branch master in repository thawab. from 068547c Release 3.2.0-1 new 8dde9e3 Fix ftbs issue #846560 new 408ffa6 Update control and changelog files new 170ba6a Add bug details in changelog new 17e2ab7 Update standards-version new 84b9536 Add NMU upload to changelog new bdc3c3f Remove debian/menu file new 8ed789d Update changelog new 4d86434 Update binary inclusion in changelog new f11a6c6 Update changelog for binary included upload new 50b4e77 Fix changelog entry new 48070c7 Fix changelog new 26c96ec New upstream version 4.1 new 26fa674 New upstream version 4.1 new cd294fb Merge tag 'upstream/4.1' new cd0e4a6 Update changelog new a304c74 Update private-pkg patch new 9197b25 Update changelog The 17 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Thawab/gtkUi.py | 3 + Thawab/shamelaUtils.py | 35 +- debian/changelog | 27 +- debian/control | 7 +- debian/menu | 5 - debian/patches/private-pkg.diff | 13 +- thawab-data/themes/default/templates/main.html | 2 +- thawab-data/themes/{default => neo}/static/fx.css | 1 + .../themes/{default => neo}/static/ie-fx.css | 0 .../themes/{default => neo}/static/img/about.gif | Bin thawab-data/themes/neo/static/img/book.png | Bin 0 -> 1438 bytes .../themes/{default => neo}/static/img/close.gif | Bin .../themes/{default => neo}/static/img/code.gif | Bin .../{default => neo}/static/img/external.gif | Bin thawab-data/themes/neo/static/img/favicon.ico | Bin 0 -> 4822 bytes .../themes/{default => neo}/static/img/forum.gif | Bin .../themes/{default => neo}/static/img/get_ffx.png | Bin thawab-data/themes/neo/static/img/go-back.png | Bin 0 -> 1129 bytes thawab-data/themes/neo/static/img/go-next.png | Bin 0 -> 1108 bytes thawab-data/themes/neo/static/img/go-up.png | Bin 0 -> 1074 bytes thawab-data/themes/neo/static/img/home.png | Bin 0 -> 1874 bytes .../themes/{default => neo}/static/img/loading.gif | Bin thawab-data/themes/neo/static/img/logo.png | Bin 0 -> 77673 bytes .../themes/{default => neo}/static/img/mail.gif | Bin thawab-data/themes/neo/static/img/print.png | Bin 0 -> 1253 bytes .../themes/{default => neo}/static/img/quote.gif | Bin .../themes/{default => neo}/static/img/rpm.gif | Bin .../{default => neo}/static/img/scrolldn.png | Bin .../{default => neo}/static/img/scrollup.png | Bin thawab-data/themes/neo/static/img/search.png | Bin 0 -> 1560 bytes thawab-data/themes/neo/static/img/spacer.png | Bin 0 -> 1160 bytes thawab-data/themes/neo/static/img/text.png | Bin 0 -> 1963 bytes .../themes/{default => neo}/static/img/tree.png | Bin .../themes/{default => neo}/static/img/up.gif | Bin .../{default => neo}/static/img/valid-css-blue.gif | Bin .../static/img/valid-xhtml10-blue.gif | Bin thawab-data/themes/neo/static/main.css | 493 +++++++++++++++++++++ thawab-data/themes/{default => neo}/static/main.js | 0 .../themes/{default => neo}/static/manual/all.css | 0 .../static/manual/images/important.png | Bin .../{default => neo}/static/manual/images/note.png | Bin .../{default => neo}/static/manual/images/tip.png | Bin .../static/manual/images/warning.png | Bin .../{default => neo}/static/manual/manual.html | 0 .../themes/{default => neo}/static/print.css | 0 .../themes/{default => neo}/static/th-main.js | 35 +- .../themes/{default => neo}/static/th-view.js | 53 ++- .../themes/{default => neo}/templates/footer.html | 20 +- .../themes/{default => neo}/templates/layout.html | 19 +- .../themes/{default => neo}/templates/main.html | 57 +-- .../{default => neo}/templates/minisearch.html | 4 +- thawab-data/themes/neo/templates/view.html | 43 ++ thawab-server | 252 ++++++++++- thawab.spec | 129 ++++-- 54 files changed, 1045 insertions(+), 153 deletions(-) delete mode 100644 debian/menu copy thawab-data/themes/{default => neo}/static/fx.css (99%) copy thawab-data/themes/{default => neo}/static/ie-fx.css (100%) copy thawab-data/themes/{default => neo}/static/img/about.gif (100%) create mode 100644 thawab-data/themes/neo/static/img/book.png copy thawab-data/themes/{default => neo}/static/img/close.gif (100%) copy thawab-data/themes/{default => neo}/static/img/code.gif (100%) copy thawab-data/themes/{default => neo}/static/img/external.gif (100%) create mode 100644 thawab-data/themes/neo/static/img/favicon.ico copy thawab-data/themes/{default => neo}/static/img/forum.gif (100%) copy thawab-data/themes/{default => neo}/static/img/get_ffx.png (100%) create mode 100644 thawab-data/themes/neo/static/img/go-back.png create mode 100644 thawab-data/themes/neo/static/img/go-next.png create mode 100644 thawab-data/themes/neo/static/img/go-up.png create mode 100644 thawab-data/themes/neo/static/img/home.png copy thawab-data/themes/{default => neo}/static/img/loading.gif (100%) create mode 100644 thawab-data/themes/neo/static/img/logo.png copy thawab-data/themes/{default => neo}/static/img/mail.gif (100%) create mode 100644 thawab-data/themes/neo/static/img/print.png copy thawab-data/themes/{default => neo}/static/img/quote.gif (100%) copy thawab-data/themes/{default => neo}/static/img/rpm.gif (100%) copy thawab-data/themes/{default => neo}/static/img/scrolldn.png (100%) copy thawab-data/themes/{default => neo}/static/img/scrollup.png (100%) create mode 100644 thawab-data/themes/neo/static/img/search.png create mode 100644 thawab-data/themes/neo/static/img/spacer.png create mode 100644 thawab-data/themes/neo/static/img/text.png copy thawab-data/themes/{default => neo}/static/img/tree.png (100%) copy thawab-data/themes/{default => neo}/static/img/up.gif (100%) copy thawab-data/themes/{default => neo}/static/img/valid-css-blue.gif (100%) copy thawab-data/themes/{default => neo}/static/img/valid-xhtml10-blue.gif (100%) create mode 100644 thawab-data/themes/neo/static/main.css copy thawab-data/themes/{default => neo}/static/main.js (100%) copy thawab-data/themes/{default => neo}/static/manual/all.css (100%) copy thawab-data/themes/{default => neo}/static/manual/images/important.png (100%) copy thawab-data/themes/{default => neo}/static/manual/images/note.png (100%) copy thawab-data/themes/{default => neo}/static/manual/images/tip.png (100%) copy thawab-data/themes/{default => neo}/static/manual/images/warning.png (100%) copy thawab-data/themes/{default => neo}/static/manual/manual.html (100%) copy thawab-data/themes/{default => neo}/static/print.css (100%) copy thawab-data/themes/{default => neo}/static/th-main.js (76%) copy thawab-data/themes/{default => neo}/static/th-view.js (69%) copy thawab-data/themes/{default => neo}/templates/footer.html (61%) copy thawab-data/themes/{default => neo}/templates/layout.html (55%) copy thawab-data/themes/{default => neo}/templates/main.html (64%) copy thawab-data/themes/{default => neo}/templates/minisearch.html (81%) create mode 100644 thawab-data/themes/neo/templates/view.html -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:28 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:28 +0000 Subject: [Debian-islamic-commits] [thawab] 01/17: Fix ftbs issue #846560 In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 8dde9e34090ed962ca965b64cf3b745d0b179604 Author: Shanavas M Date: Tue Mar 14 13:05:12 2017 +0000 Fix ftbs issue #846560 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=846560 --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index dfc9e9a..b04f43c 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends-Indep: python-all (>= 2.6.6-3~), gettext, intltool, imagemagick, + librsvg2-bin, libmagickcore-extra | libmagickcore2-extra Standards-Version: 3.9.6 Homepage: http://thawab.ojuba.org -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:28 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:28 +0000 Subject: [Debian-islamic-commits] [thawab] 02/17: Update control and changelog files In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 408ffa6b38c7ff6ead1d72d8c0ff058b58c4c556 Author: Shanavas M Date: Tue Mar 14 17:00:01 2017 +0300 Update control and changelog files --- debian/changelog | 10 +++++++++- debian/control | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index b1421fd..f40f894 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +thawab (3.2.0-1.1) unstable; urgency=medium + + * debian/control: + + replace Build-Depends-Indep libmagickcore-extra and libmagickcore2-extra with librsvg2-bin + + add dh-python to Build-Depends + + -- Shanavas M Tue, 14 Mar 2017 16:58:07 +0300 + thawab (3.2.0-1) unstable; urgency=medium * New upstream release. @@ -149,7 +157,7 @@ thawab (3.0.8-0ubuntu1) maverick; urgency=low Makefile. * Added a patch desktop-categories.diff, to add Education;Literature to categories - * Added private-pkg.diff patch, to install Thawab python package as a + * Added private-pkg.diff patch, to install Thawab python package as a private package. -- ???? ???????? (Ahmed El-Mahmoudy) Mon, 26 Jul 2010 22:48:05 +0300 diff --git a/debian/control b/debian/control index b04f43c..1ce33b1 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Section: non-free/misc Priority: extra Maintainer: Debian Islamic Maintainers Uploaders: ???? ???????? (Ahmed El-Mahmoudy) -Build-Depends: debhelper (>= 9) +Build-Depends: debhelper (>= 9), + dh-python Build-Depends-Indep: python-all (>= 2.6.6-3~), gettext, intltool, imagemagick, - librsvg2-bin, - libmagickcore-extra | libmagickcore2-extra + librsvg2-bin Standards-Version: 3.9.6 Homepage: http://thawab.ojuba.org Vcs-Git: git://anonscm.debian.org/debian-islamic/packages/thawab.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:28 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:28 +0000 Subject: [Debian-islamic-commits] [thawab] 03/17: Add bug details in changelog In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 170ba6a10a22165fc19fccdb1b8f2e6f559b0f9e Author: Shanavas M Date: Tue Mar 14 17:52:43 2017 +0300 Add bug details in changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f40f894..7b57c60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ thawab (3.2.0-1.1) unstable; urgency=medium * debian/control: - + replace Build-Depends-Indep libmagickcore-extra and libmagickcore2-extra with librsvg2-bin + + replace Build-Depends-Indep libmagickcore-extra and libmagickcore2-extra with librsvg2-bin (Closes #846560) + add dh-python to Build-Depends -- Shanavas M Tue, 14 Mar 2017 16:58:07 +0300 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:28 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:28 +0000 Subject: [Debian-islamic-commits] [thawab] 04/17: Update standards-version In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 17e2ab7d59208c3592c41369bf747608dcb1e35d Author: Shanavas M Date: Tue Mar 14 18:46:10 2017 +0300 Update standards-version --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 1ce33b1..d56bd94 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends-Indep: python-all (>= 2.6.6-3~), intltool, imagemagick, librsvg2-bin -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: http://thawab.ojuba.org Vcs-Git: git://anonscm.debian.org/debian-islamic/packages/thawab.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-islamic/packages/thawab.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:28 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:28 +0000 Subject: [Debian-islamic-commits] [thawab] 05/17: Add NMU upload to changelog In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 84b9536d2e216f19084a3c15f84240332e2f9ab7 Author: Shanavas M Date: Tue Mar 14 19:03:49 2017 +0300 Add NMU upload to changelog --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7b57c60..b96190c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ thawab (3.2.0-1.1) unstable; urgency=medium + * NMU upload * debian/control: - + replace Build-Depends-Indep libmagickcore-extra and libmagickcore2-extra with librsvg2-bin (Closes #846560) + + replace Build-Depends-Indep libmagickcore-extra and libmagickcore2-extra + with librsvg2-bin (Closes: #846560) + add dh-python to Build-Depends -- Shanavas M Tue, 14 Mar 2017 16:58:07 +0300 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:28 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:28 +0000 Subject: [Debian-islamic-commits] [thawab] 06/17: Remove debian/menu file In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit bdc3c3f2d8e500fea78b6bcb52420e0d01380b57 Author: Shanavas M Date: Tue Mar 14 20:25:23 2017 +0300 Remove debian/menu file Fixes lintian warning command-in-menu-file-and-desktop-file --- debian/menu | 5 ----- 1 file changed, 5 deletions(-) diff --git a/debian/menu b/debian/menu deleted file mode 100644 index b84e2b4..0000000 --- a/debian/menu +++ /dev/null @@ -1,5 +0,0 @@ -?package(thawab):\ - needs="X11"\ - section="Applications/Education"\ - title="Arabic/Islamic encyclopedia system"\ - command="/usr/bin/thawab-gtk" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:29 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:29 +0000 Subject: [Debian-islamic-commits] [thawab] 07/17: Update changelog In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 8ed789d1bda8d0337e4237907c201b389a864de0 Author: Shanavas M Date: Tue Mar 14 20:27:45 2017 +0300 Update changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index b96190c..94340a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ thawab (3.2.0-1.1) unstable; urgency=medium + replace Build-Depends-Indep libmagickcore-extra and libmagickcore2-extra with librsvg2-bin (Closes: #846560) + add dh-python to Build-Depends + * remove debian/menu file -- Shanavas M Tue, 14 Mar 2017 16:58:07 +0300 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:29 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:29 +0000 Subject: [Debian-islamic-commits] [thawab] 08/17: Update binary inclusion in changelog In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 4d86434053679daa150c45c97e5f1b261c264143 Author: Shanavas M Date: Sun Mar 19 09:40:09 2017 +0300 Update binary inclusion in changelog --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 94340a2..43e22a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -thawab (3.2.0-1.1) unstable; urgency=medium +thawab (3.2.0-1.2) unstable; urgency=medium * NMU upload + * binary included upload * debian/control: + replace Build-Depends-Indep libmagickcore-extra and libmagickcore2-extra with librsvg2-bin (Closes: #846560) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:29 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:29 +0000 Subject: [Debian-islamic-commits] [thawab] 09/17: Update changelog for binary included upload In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit f11a6c6428221ba0b4fcf44ada475bf99401ebb1 Author: Shanavas M Date: Mon Mar 20 05:59:21 2017 +0000 Update changelog for binary included upload --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 43e22a4..9860c9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,13 @@ thawab (3.2.0-1.2) unstable; urgency=medium * NMU upload * binary included upload + + -- Shanavas M Mon, 20 Mar 2017 08:58:07 +0300 + +thawab (3.2.0-1.1) unstable; urgency=medium + + * NMU upload + * binary included upload * debian/control: + replace Build-Depends-Indep libmagickcore-extra and libmagickcore2-extra with librsvg2-bin (Closes: #846560) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:29 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:29 +0000 Subject: [Debian-islamic-commits] [thawab] 10/17: Fix changelog entry In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 50b4e77b256920ada2812b913e47530bea8adfb5 Author: Shanavas M Date: Mon Mar 20 09:25:55 2017 +0300 Fix changelog entry --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9860c9c..944c0c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,13 @@ thawab (3.2.0-1.2) unstable; urgency=medium - * NMU upload + * Non Maintainer Upload * binary included upload -- Shanavas M Mon, 20 Mar 2017 08:58:07 +0300 thawab (3.2.0-1.1) unstable; urgency=medium - * NMU upload - * binary included upload + * Non Maintainer Upload * debian/control: + replace Build-Depends-Indep libmagickcore-extra and libmagickcore2-extra with librsvg2-bin (Closes: #846560) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:29 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:29 +0000 Subject: [Debian-islamic-commits] [thawab] 11/17: Fix changelog In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 48070c729484fb245e2b414c2fdd49a0ca0df62e Author: Shanavas M Date: Mon Mar 20 09:40:08 2017 +0000 Fix changelog --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 944c0c1..cf204eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ thawab (3.2.0-1.2) unstable; urgency=medium - * Non Maintainer Upload + * Non-maintainer upload * binary included upload -- Shanavas M Mon, 20 Mar 2017 08:58:07 +0300 thawab (3.2.0-1.1) unstable; urgency=medium - * Non Maintainer Upload + * NMU upload * debian/control: + replace Build-Depends-Indep libmagickcore-extra and libmagickcore2-extra with librsvg2-bin (Closes: #846560) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:29 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:29 +0000 Subject: [Debian-islamic-commits] [thawab] 13/17: New upstream version 4.1 In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 26fa674e2bd361b99b02e0ada585c24d5aefba9d Author: Shanavas M Date: Sun Jun 4 13:18:03 2017 +0300 New upstream version 4.1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:29 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:29 +0000 Subject: [Debian-islamic-commits] [thawab] 14/17: Merge tag 'upstream/4.1' In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit cd294fb4d8eaa57181be5b9908f5b0afe7a6210b Merge: 48070c7 26fa674 Author: Shanavas M Date: Sun Jun 4 13:18:03 2017 +0300 Merge tag 'upstream/4.1' Upstream version 4.1 Thawab/gtkUi.py | 3 + Thawab/shamelaUtils.py | 35 +- thawab-data/themes/default/templates/main.html | 2 +- thawab-data/themes/neo/static/fx.css | 73 +++ thawab-data/themes/neo/static/ie-fx.css | 17 + thawab-data/themes/neo/static/img/about.gif | Bin 0 -> 1135 bytes thawab-data/themes/neo/static/img/book.png | Bin 0 -> 1438 bytes thawab-data/themes/neo/static/img/close.gif | Bin 0 -> 1222 bytes thawab-data/themes/neo/static/img/code.gif | Bin 0 -> 1210 bytes thawab-data/themes/neo/static/img/external.gif | Bin 0 -> 101 bytes thawab-data/themes/neo/static/img/favicon.ico | Bin 0 -> 4822 bytes thawab-data/themes/neo/static/img/forum.gif | Bin 0 -> 1146 bytes thawab-data/themes/neo/static/img/get_ffx.png | Bin 0 -> 7050 bytes thawab-data/themes/neo/static/img/go-back.png | Bin 0 -> 1129 bytes thawab-data/themes/neo/static/img/go-next.png | Bin 0 -> 1108 bytes thawab-data/themes/neo/static/img/go-up.png | Bin 0 -> 1074 bytes thawab-data/themes/neo/static/img/home.png | Bin 0 -> 1874 bytes thawab-data/themes/neo/static/img/loading.gif | Bin 0 -> 3474 bytes thawab-data/themes/neo/static/img/logo.png | Bin 0 -> 77673 bytes thawab-data/themes/neo/static/img/mail.gif | Bin 0 -> 634 bytes thawab-data/themes/neo/static/img/print.png | Bin 0 -> 1253 bytes thawab-data/themes/neo/static/img/quote.gif | Bin 0 -> 529 bytes thawab-data/themes/neo/static/img/rpm.gif | Bin 0 -> 1144 bytes thawab-data/themes/neo/static/img/scrolldn.png | Bin 0 -> 955 bytes thawab-data/themes/neo/static/img/scrollup.png | Bin 0 -> 907 bytes thawab-data/themes/neo/static/img/search.png | Bin 0 -> 1560 bytes thawab-data/themes/neo/static/img/spacer.png | Bin 0 -> 1160 bytes thawab-data/themes/neo/static/img/text.png | Bin 0 -> 1963 bytes thawab-data/themes/neo/static/img/tree.png | Bin 0 -> 888 bytes thawab-data/themes/neo/static/img/up.gif | Bin 0 -> 86 bytes .../themes/neo/static/img/valid-css-blue.gif | Bin 0 -> 1759 bytes .../themes/neo/static/img/valid-xhtml10-blue.gif | Bin 0 -> 2065 bytes thawab-data/themes/neo/static/main.css | 493 +++++++++++++++++++++ thawab-data/themes/neo/static/main.js | 219 +++++++++ thawab-data/themes/neo/static/manual/all.css | 120 +++++ .../themes/neo/static/manual/images/important.png | Bin 0 -> 2250 bytes .../themes/neo/static/manual/images/note.png | Bin 0 -> 2520 bytes .../themes/neo/static/manual/images/tip.png | Bin 0 -> 2909 bytes .../themes/neo/static/manual/images/warning.png | Bin 0 -> 3249 bytes thawab-data/themes/neo/static/manual/manual.html | 273 ++++++++++++ thawab-data/themes/neo/static/print.css | 3 + thawab-data/themes/neo/static/th-main.js | 153 +++++++ thawab-data/themes/neo/static/th-view.js | 164 +++++++ thawab-data/themes/neo/templates/footer.html | 19 + thawab-data/themes/neo/templates/layout.html | 43 ++ .../themes/{default => neo}/templates/main.html | 57 +-- thawab-data/themes/neo/templates/minisearch.html | 25 ++ thawab-data/themes/neo/templates/view.html | 43 ++ thawab-server | 252 ++++++++++- thawab.spec | 129 ++++-- 50 files changed, 2047 insertions(+), 76 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:29 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:29 +0000 Subject: [Debian-islamic-commits] [thawab] 15/17: Update changelog In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit cd0e4a61c76f8b6293ae987cd03ed05bd50af576 Author: Shanavas M Date: Sun Jun 4 14:29:49 2017 +0300 Update changelog --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index cf204eb..5d8d56a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +thawab (4.1-1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * binary included upload + * New upstream release + + -- Shanavas M Sun, 04 Jun 2017 14:26:59 +0300 + thawab (3.2.0-1.2) unstable; urgency=medium * Non-maintainer upload -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:30 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:30 +0000 Subject: [Debian-islamic-commits] [thawab] 16/17: Update private-pkg patch In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit a304c74268ec0b0ed1a5961627438eb03f9a2755 Author: Shanavas M Date: Sun Jun 4 11:51:00 2017 +0000 Update private-pkg patch --- debian/patches/private-pkg.diff | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/patches/private-pkg.diff b/debian/patches/private-pkg.diff index 8a87f43..6972176 100644 --- a/debian/patches/private-pkg.diff +++ b/debian/patches/private-pkg.diff @@ -12,12 +12,11 @@ Forwarded: not-needed main() --- a/thawab-server +++ b/thawab-server -@@ -1,6 +1,8 @@ - #!/usr/bin/python2 +@@ -1,6 +1,7 @@ + #! /usr/bin/python # -*- coding: UTF-8 -*- - -+import sys + import sys, os, time, atexit, signal, shutil, tempfile, sqlite3 +sys.path.append("/usr/share/thawab") - from Thawab.gtkUi import onlyterminal - onlyterminal() - + from Thawab.gtkUi import launchServer + from Thawab.shamelaUtils import ShamelaSqlite, shamelaImport + class ThawabServer: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:30 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:30 +0000 Subject: [Debian-islamic-commits] [thawab] 17/17: Update changelog In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 9197b25f6fda7d43abd8179c09202c90ebda6171 Author: Shanavas M Date: Sun Jun 4 12:15:30 2017 +0000 Update changelog --- debian/changelog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d8d56a..90cd2ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,7 @@ thawab (4.1-1) UNRELEASED; urgency=medium - * Non-maintainer upload. - * binary included upload * New upstream release + * Fix debian/patches/private-pkg.diff -- Shanavas M Sun, 04 Jun 2017 14:26:59 +0300 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:30 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:30 +0000 Subject: [Debian-islamic-commits] [thawab] branch pristine-tar updated (edc977b -> 3054b21) Message-ID: <20170606080427.9227.43313@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a change to branch pristine-tar in repository thawab. from edc977b pristine-tar data for thawab_3.2.0.orig.tar.gz new 3054b21 pristine-tar data for thawab_4.1.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: thawab_4.1.orig.tar.gz.delta | Bin 0 -> 4357 bytes thawab_4.1.orig.tar.gz.id | 1 + 2 files changed, 1 insertion(+) create mode 100644 thawab_4.1.orig.tar.gz.delta create mode 100644 thawab_4.1.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:30 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:30 +0000 Subject: [Debian-islamic-commits] [thawab] 01/01: pristine-tar data for thawab_4.1.orig.tar.gz In-Reply-To: <20170606080427.9227.43313@moszumanska.debian.org> References: <20170606080427.9227.43313@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch pristine-tar in repository thawab. commit 3054b21b90d73dd0d3c44434f455f37c73476984 Author: Shanavas M Date: Sun Jun 4 13:18:03 2017 +0300 pristine-tar data for thawab_4.1.orig.tar.gz --- thawab_4.1.orig.tar.gz.delta | Bin 0 -> 4357 bytes thawab_4.1.orig.tar.gz.id | 1 + 2 files changed, 1 insertion(+) diff --git a/thawab_4.1.orig.tar.gz.delta b/thawab_4.1.orig.tar.gz.delta new file mode 100644 index 0000000..70900a1 Binary files /dev/null and b/thawab_4.1.orig.tar.gz.delta differ diff --git a/thawab_4.1.orig.tar.gz.id b/thawab_4.1.orig.tar.gz.id new file mode 100644 index 0000000..6e5b02c --- /dev/null +++ b/thawab_4.1.orig.tar.gz.id @@ -0,0 +1 @@ +e20023ed4ffd0b3c1a4b60e9f76440a53db10b4c -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:30 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:30 +0000 Subject: [Debian-islamic-commits] [thawab] branch upstream updated (6556a0f -> 26fa674) Message-ID: <20170606080427.9227.86477@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a change to branch upstream in repository thawab. from 6556a0f Imported Upstream version 3.2.0 new 26c96ec New upstream version 4.1 new 26fa674 New upstream version 4.1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Thawab/gtkUi.py | 3 + Thawab/shamelaUtils.py | 35 +- thawab-data/themes/default/templates/main.html | 2 +- thawab-data/themes/{default => neo}/static/fx.css | 1 + .../themes/{default => neo}/static/ie-fx.css | 0 .../themes/{default => neo}/static/img/about.gif | Bin thawab-data/themes/neo/static/img/book.png | Bin 0 -> 1438 bytes .../themes/{default => neo}/static/img/close.gif | Bin .../themes/{default => neo}/static/img/code.gif | Bin .../{default => neo}/static/img/external.gif | Bin thawab-data/themes/neo/static/img/favicon.ico | Bin 0 -> 4822 bytes .../themes/{default => neo}/static/img/forum.gif | Bin .../themes/{default => neo}/static/img/get_ffx.png | Bin thawab-data/themes/neo/static/img/go-back.png | Bin 0 -> 1129 bytes thawab-data/themes/neo/static/img/go-next.png | Bin 0 -> 1108 bytes thawab-data/themes/neo/static/img/go-up.png | Bin 0 -> 1074 bytes thawab-data/themes/neo/static/img/home.png | Bin 0 -> 1874 bytes .../themes/{default => neo}/static/img/loading.gif | Bin thawab-data/themes/neo/static/img/logo.png | Bin 0 -> 77673 bytes .../themes/{default => neo}/static/img/mail.gif | Bin thawab-data/themes/neo/static/img/print.png | Bin 0 -> 1253 bytes .../themes/{default => neo}/static/img/quote.gif | Bin .../themes/{default => neo}/static/img/rpm.gif | Bin .../{default => neo}/static/img/scrolldn.png | Bin .../{default => neo}/static/img/scrollup.png | Bin thawab-data/themes/neo/static/img/search.png | Bin 0 -> 1560 bytes thawab-data/themes/neo/static/img/spacer.png | Bin 0 -> 1160 bytes thawab-data/themes/neo/static/img/text.png | Bin 0 -> 1963 bytes .../themes/{default => neo}/static/img/tree.png | Bin .../themes/{default => neo}/static/img/up.gif | Bin .../{default => neo}/static/img/valid-css-blue.gif | Bin .../static/img/valid-xhtml10-blue.gif | Bin thawab-data/themes/neo/static/main.css | 493 +++++++++++++++++++++ thawab-data/themes/{default => neo}/static/main.js | 0 .../themes/{default => neo}/static/manual/all.css | 0 .../static/manual/images/important.png | Bin .../{default => neo}/static/manual/images/note.png | Bin .../{default => neo}/static/manual/images/tip.png | Bin .../static/manual/images/warning.png | Bin .../{default => neo}/static/manual/manual.html | 0 .../themes/{default => neo}/static/print.css | 0 .../themes/{default => neo}/static/th-main.js | 35 +- .../themes/{default => neo}/static/th-view.js | 53 ++- .../themes/{default => neo}/templates/footer.html | 20 +- .../themes/{default => neo}/templates/layout.html | 19 +- .../themes/{default => neo}/templates/main.html | 57 +-- .../{default => neo}/templates/minisearch.html | 4 +- thawab-data/themes/neo/templates/view.html | 43 ++ thawab-server | 252 ++++++++++- thawab.spec | 129 ++++-- 50 files changed, 1009 insertions(+), 137 deletions(-) copy thawab-data/themes/{default => neo}/static/fx.css (99%) copy thawab-data/themes/{default => neo}/static/ie-fx.css (100%) copy thawab-data/themes/{default => neo}/static/img/about.gif (100%) create mode 100644 thawab-data/themes/neo/static/img/book.png copy thawab-data/themes/{default => neo}/static/img/close.gif (100%) copy thawab-data/themes/{default => neo}/static/img/code.gif (100%) copy thawab-data/themes/{default => neo}/static/img/external.gif (100%) create mode 100644 thawab-data/themes/neo/static/img/favicon.ico copy thawab-data/themes/{default => neo}/static/img/forum.gif (100%) copy thawab-data/themes/{default => neo}/static/img/get_ffx.png (100%) create mode 100644 thawab-data/themes/neo/static/img/go-back.png create mode 100644 thawab-data/themes/neo/static/img/go-next.png create mode 100644 thawab-data/themes/neo/static/img/go-up.png create mode 100644 thawab-data/themes/neo/static/img/home.png copy thawab-data/themes/{default => neo}/static/img/loading.gif (100%) create mode 100644 thawab-data/themes/neo/static/img/logo.png copy thawab-data/themes/{default => neo}/static/img/mail.gif (100%) create mode 100644 thawab-data/themes/neo/static/img/print.png copy thawab-data/themes/{default => neo}/static/img/quote.gif (100%) copy thawab-data/themes/{default => neo}/static/img/rpm.gif (100%) copy thawab-data/themes/{default => neo}/static/img/scrolldn.png (100%) copy thawab-data/themes/{default => neo}/static/img/scrollup.png (100%) create mode 100644 thawab-data/themes/neo/static/img/search.png create mode 100644 thawab-data/themes/neo/static/img/spacer.png create mode 100644 thawab-data/themes/neo/static/img/text.png copy thawab-data/themes/{default => neo}/static/img/tree.png (100%) copy thawab-data/themes/{default => neo}/static/img/up.gif (100%) copy thawab-data/themes/{default => neo}/static/img/valid-css-blue.gif (100%) copy thawab-data/themes/{default => neo}/static/img/valid-xhtml10-blue.gif (100%) create mode 100644 thawab-data/themes/neo/static/main.css copy thawab-data/themes/{default => neo}/static/main.js (100%) copy thawab-data/themes/{default => neo}/static/manual/all.css (100%) copy thawab-data/themes/{default => neo}/static/manual/images/important.png (100%) copy thawab-data/themes/{default => neo}/static/manual/images/note.png (100%) copy thawab-data/themes/{default => neo}/static/manual/images/tip.png (100%) copy thawab-data/themes/{default => neo}/static/manual/images/warning.png (100%) copy thawab-data/themes/{default => neo}/static/manual/manual.html (100%) copy thawab-data/themes/{default => neo}/static/print.css (100%) copy thawab-data/themes/{default => neo}/static/th-main.js (76%) copy thawab-data/themes/{default => neo}/static/th-view.js (69%) copy thawab-data/themes/{default => neo}/templates/footer.html (61%) copy thawab-data/themes/{default => neo}/templates/layout.html (55%) copy thawab-data/themes/{default => neo}/templates/main.html (64%) copy thawab-data/themes/{default => neo}/templates/minisearch.html (81%) create mode 100644 thawab-data/themes/neo/templates/view.html -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:37 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:37 +0000 Subject: [Debian-islamic-commits] [thawab] annotated tag upstream/4.1 created (now 4a3f2e9) Message-ID: <20170606080437.10093.76025@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a change to annotated tag upstream/4.1 in repository thawab. at 4a3f2e9 (tag) tagging 26fa674e2bd361b99b02e0ada585c24d5aefba9d (commit) replaces upstream/3.2.0 tagged by Shanavas M on Sun Jun 4 13:18:03 2017 +0300 - Log ----------------------------------------------------------------- Upstream version 4.1 Shanavas M (2): New upstream version 4.1 New upstream version 4.1 ----------------------------------------------------------------------- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:37 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:37 +0000 Subject: [Debian-islamic-commits] [thawab] tag debian/3.0.11-1.1 created (now 8ed789d) Message-ID: <20170606080437.10093.63636@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a change to tag debian/3.0.11-1.1 in repository thawab. at 8ed789d (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:37 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:37 +0000 Subject: [Debian-islamic-commits] [thawab] tag debian/3.2.0-1.2 created (now 48070c7) Message-ID: <20170606080437.10093.59410@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a change to tag debian/3.2.0-1.2 in repository thawab. at 48070c7 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git From shanavas-guest at moszumanska.debian.org Tue Jun 6 08:04:29 2017 From: shanavas-guest at moszumanska.debian.org (Shanavas M) Date: Tue, 06 Jun 2017 08:04:29 +0000 Subject: [Debian-islamic-commits] [thawab] 12/17: New upstream version 4.1 In-Reply-To: <20170606080427.9227.2466@moszumanska.debian.org> References: <20170606080427.9227.2466@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. shanavas-guest pushed a commit to branch master in repository thawab. commit 26c96ec6cbc3de1ce8b2aa2442c7ffc6ad217d16 Author: Shanavas M Date: Sun Jun 4 13:16:02 2017 +0300 New upstream version 4.1 --- Thawab/gtkUi.py | 3 + Thawab/shamelaUtils.py | 35 +- thawab-data/themes/default/templates/main.html | 2 +- thawab-data/themes/neo/static/fx.css | 73 +++ thawab-data/themes/neo/static/ie-fx.css | 17 + thawab-data/themes/neo/static/img/about.gif | Bin 0 -> 1135 bytes thawab-data/themes/neo/static/img/book.png | Bin 0 -> 1438 bytes thawab-data/themes/neo/static/img/close.gif | Bin 0 -> 1222 bytes thawab-data/themes/neo/static/img/code.gif | Bin 0 -> 1210 bytes thawab-data/themes/neo/static/img/external.gif | Bin 0 -> 101 bytes thawab-data/themes/neo/static/img/favicon.ico | Bin 0 -> 4822 bytes thawab-data/themes/neo/static/img/forum.gif | Bin 0 -> 1146 bytes thawab-data/themes/neo/static/img/get_ffx.png | Bin 0 -> 7050 bytes thawab-data/themes/neo/static/img/go-back.png | Bin 0 -> 1129 bytes thawab-data/themes/neo/static/img/go-next.png | Bin 0 -> 1108 bytes thawab-data/themes/neo/static/img/go-up.png | Bin 0 -> 1074 bytes thawab-data/themes/neo/static/img/home.png | Bin 0 -> 1874 bytes thawab-data/themes/neo/static/img/loading.gif | Bin 0 -> 3474 bytes thawab-data/themes/neo/static/img/logo.png | Bin 0 -> 77673 bytes thawab-data/themes/neo/static/img/mail.gif | Bin 0 -> 634 bytes thawab-data/themes/neo/static/img/print.png | Bin 0 -> 1253 bytes thawab-data/themes/neo/static/img/quote.gif | Bin 0 -> 529 bytes thawab-data/themes/neo/static/img/rpm.gif | Bin 0 -> 1144 bytes thawab-data/themes/neo/static/img/scrolldn.png | Bin 0 -> 955 bytes thawab-data/themes/neo/static/img/scrollup.png | Bin 0 -> 907 bytes thawab-data/themes/neo/static/img/search.png | Bin 0 -> 1560 bytes thawab-data/themes/neo/static/img/spacer.png | Bin 0 -> 1160 bytes thawab-data/themes/neo/static/img/text.png | Bin 0 -> 1963 bytes thawab-data/themes/neo/static/img/tree.png | Bin 0 -> 888 bytes thawab-data/themes/neo/static/img/up.gif | Bin 0 -> 86 bytes .../themes/neo/static/img/valid-css-blue.gif | Bin 0 -> 1759 bytes .../themes/neo/static/img/valid-xhtml10-blue.gif | Bin 0 -> 2065 bytes thawab-data/themes/neo/static/main.css | 493 +++++++++++++++++++++ thawab-data/themes/neo/static/main.js | 219 +++++++++ thawab-data/themes/neo/static/manual/all.css | 120 +++++ .../themes/neo/static/manual/images/important.png | Bin 0 -> 2250 bytes .../themes/neo/static/manual/images/note.png | Bin 0 -> 2520 bytes .../themes/neo/static/manual/images/tip.png | Bin 0 -> 2909 bytes .../themes/neo/static/manual/images/warning.png | Bin 0 -> 3249 bytes thawab-data/themes/neo/static/manual/manual.html | 273 ++++++++++++ thawab-data/themes/neo/static/print.css | 3 + thawab-data/themes/neo/static/th-main.js | 153 +++++++ thawab-data/themes/neo/static/th-view.js | 164 +++++++ thawab-data/themes/neo/templates/footer.html | 19 + thawab-data/themes/neo/templates/layout.html | 43 ++ .../themes/{default => neo}/templates/main.html | 57 +-- thawab-data/themes/neo/templates/minisearch.html | 25 ++ thawab-data/themes/neo/templates/view.html | 43 ++ thawab-server | 252 ++++++++++- thawab.spec | 129 ++++-- 50 files changed, 2047 insertions(+), 76 deletions(-) diff --git a/Thawab/gtkUi.py b/Thawab/gtkUi.py index bf69320..c8d4091 100644 --- a/Thawab/gtkUi.py +++ b/Thawab/gtkUi.py @@ -22,6 +22,9 @@ import sys, os, os.path, time, re, sqlite3 import shutil, tempfile import threading, socket import gettext +import gi +gi.require_version("Gtk", "3.0") +gi.require_version("WebKit", "3.0") from gi.repository import Gtk, Gdk, GObject, WebKit, Pango, GLib from subprocess import Popen, PIPE from urllib import unquote diff --git a/Thawab/shamelaUtils.py b/Thawab/shamelaUtils.py index 330586c..9dba0a0 100644 --- a/Thawab/shamelaUtils.py +++ b/Thawab/shamelaUtils.py @@ -85,7 +85,7 @@ sh_digits_to_spaces_tb = { sh_normalize_tb = { 65: 97, 66: 98, 67: 99, 68: 100, 69: 101, 70: 102, 71: 103, 72: 104, 73: 105, 74: 106, 75: 107, 76: 108, 77: 109, 78: 110, 79: 111, 80: 112, 81: 113, 82: 114, 83: 115, 84: 116, 85: 117, 86: 118, 87: 119, 88: 120, 89: 121, 90: 122, -1569: 1575, 1570: 1575, 1571: 1575, 1572: 1575, 1573: 1575, 1574: 1575, 1577: 1607, 1609: 1575, +1569: 1575, 1570: 1575, 1571: 1575, 1572: 1575, 1573: 1575, 1574: 1575, 1577: 1607, 1609: 1575, 8: 32, 1600:32, 1632: 48, 1633: 49, 1634: 50, 1635: 51, 1636: 52, 1637: 53, 1638: 54, 1639: 55, 1640: 56, 1641: 57, 1642:37, 1643:46 } # TODO: remove unused variables and methods @@ -96,7 +96,7 @@ std_shorts={ u'B': u'??? ???? ??', u'C': u'???? ????', u'D': u'?? ???', - u'E': u'???? ?????? ? ??????', + u'E': u'???? ?????? ? ??????', } footnotes_cnd = [] # candidate, in the form of (footnote_mark, footnote_text) tuples @@ -200,14 +200,14 @@ class ShamelaSqlite(object): raise TypeError tables = filter(lambda t: not t.isdigit(), tables) return tables - + def _getTablesInBok(self): if self.tables: return self.tables self.tables = self._getTablesInFile(self.bok_fn) self.tablesFn = dict(((t,self.bok_fn) for t in self.tables)) return self.tables - + def _getTablesInDir(self): if self.tables: return self.tables @@ -261,9 +261,9 @@ class ShamelaSqlite(object): r,e = pipe.communicate() print e r=r.replace('\r', '') - if pipe.returncode != 0: - raise TypeError - if self.mode=='0.7' or (e.startswith("mdb-schema: invalid option") and opts[1]=='-S'): + #if pipe.returncode != 0: + #raise TypeError + if self.mode=='0.7' or ((e.startswith("mdb-schema: invalid option") or e.startswith("option parsing failed: Unknown option")) and opts[1]=='-S'): print "MODE 0.7" del opts[1] self.mode='0.7' @@ -520,7 +520,7 @@ class _foundShHeadingMatchItem(): self.depth = depth self.fuzzy = fuzzy self.suffix = '' - + def __repr__(self): return (u"".format(self.start, self.end, @@ -539,7 +539,7 @@ def _fixHeadBounds(pg_txt, found): f.end = f.start f.suffix = u'\u2026' if f.fuzzy >= 7: - #then move f.start to the last \n + #then move f.start to the last \n f.end = max(pg_txt[:f.end].rfind('\n'), 0) if i > 0: f.end = max(f.end,found[i-1].end) @@ -641,9 +641,9 @@ def shamelaImport(cursor, fuzzy): # fuzzy is saved because it could be used later to figure whither to add newline # or to move start point - for m in headings_re.finditer(page_txt): # + for m in headings_re.finditer(page_txt): # # NOTE: since this is not exact, make it ends at start. FIXME: it was m.end() - candidate = _foundShHeadingMatchItem(m.start(), m.start(), h, d, fuzzy) + candidate = _foundShHeadingMatchItem(m.start(), m.start(), h, d, fuzzy) ii = bisect.bisect_left(found, candidate) # only check for overlaps in found[ii:] # skip matches that overlaps with previous headings if any(imap(lambda mi: mi.overlaps_with(candidate),found[ii:])): @@ -666,11 +666,11 @@ def shamelaImport(cursor, # print "found" candidate = _foundShHeadingMatchItem(i+shift, i+shift+l, h, d, fuzzy) # only check for overlaps in found[ii:] - ii = bisect.bisect_left(found, candidate) + ii = bisect.bisect_left(found, candidate) # skip matches that overlaps with previous headings if not any(imap(lambda mi: mi.overlaps_with(candidate),found[ii:])): # add the candidate to the found list - bisect.insort(found, candidate) + bisect.insort(found, candidate) toc_hash[page_id][j] = None return True # skip to i+l @@ -689,7 +689,7 @@ def shamelaImport(cursor, # for each heading for j, ix in enumerate(l): h, d = toc_ls[ix][1:3] - # search for entire line matches + # search for entire line matches # (exact, then only letters and digits then only letters: 1,2,3) # search for leading matches # (exact, then only letters and digits then only letters: 4,5,6) @@ -785,9 +785,9 @@ def shamelaImport(cursor, del ft[:] return s - # step 3: walk through pages, accumulating contents + # step 3: walk through pages, accumulating contents # NOTE: in some books id need not be unique - # + # blnk_base = sh.getBLink(bkid) blnk = "" blnk_old = "" @@ -980,7 +980,7 @@ def shamelaImport(cursor, last += "\n==========[\n" + \ pop_footers(footnotes_cnd) + \ "\n]==========\n" - + if not started: raise TypeError @@ -1017,4 +1017,3 @@ if __name__ == '__main__': n = meta['kitab'] del ki shutil.move(o, os.path.join(dst, n)) - diff --git a/thawab-data/themes/default/templates/main.html b/thawab-data/themes/default/templates/main.html index adcbf8b..3b4b226 100644 --- a/thawab-data/themes/default/templates/main.html +++ b/thawab-data/themes/default/templates/main.html @@ -11,7 +11,7 @@ var script=''; get package contact us forum - code + code %end
diff --git a/thawab-data/themes/neo/static/fx.css b/thawab-data/themes/neo/static/fx.css new file mode 100644 index 0000000..73b8388 --- /dev/null +++ b/thawab-data/themes/neo/static/fx.css @@ -0,0 +1,73 @@ +/* fx */ + +#async_tips_div { + background-color:rgba(255,255,200,0.9); +} + +#overlay { + opacity:0.7; +} +.showOnFocus { + opacity:0.4; +} +.showOnFocus:active, .showOnFocus:focus { + opacity:0.75; +} +.showOnFocus:hover { + opacity:1; +} + +.blurOnFocus { + opacity:1.0; +} +.blurOnFocus:active, .showOnFocus:focus { + opacity:0.75; +} +.blurOnFocus:hover { + opacity:0.4; +} + +#minisearch input { + background:rgba(255,255,255,0.6); +} +#absnav { + -webkit-border-radius:20px; + -moz-border-radius:20px; + border-radius:20px; + padding:0 20px; + + -webkit-box-shadow:0 0 8px rgba(240,240,240,0.4); + -moz-box-shadow:0 0 8px 8px rgba(240,240,240,0.4); +} +#absnav2, #absnav3{ + -webkit-border-radius:20px; + -moz-border-radius:20px; + border-radius:20px; + padding:0 20px; + + -webkit-box-shadow:0 0 8px rgba(240,240,240,0.4); + -moz-box-shadow:0 0 8px 8px rgba(240,240,240,0.4); +} +#absnav3{ + padding:0 5px; +} + +#minisearch { + -webkit-border-bottom-left-radius:8px; + -moz-border-radius-bottomleft:8px; + border-bottom-left-radius:8px; + -webkit-border-bottom-right-radius:32px; + -moz-border-radius-bottomright:32px; + border-bottom-right-radius:32px; + padding:0 8px 2px 0; +} +#container{ + -webkit-border-radius:10px; + -moz-border-radius:10px; + border-radius:10px; + + /* -webkit-box-shadow:0 0 8px rgba(128,128,128,0.4); */ + -moz-box-shadow:0 0 8px 4px rgba(128,128,128,0.4); +} +#absnav3 { position: fixed; } + diff --git a/thawab-data/themes/neo/static/ie-fx.css b/thawab-data/themes/neo/static/ie-fx.css new file mode 100644 index 0000000..e02129c --- /dev/null +++ b/thawab-data/themes/neo/static/ie-fx.css @@ -0,0 +1,17 @@ +/* fx-ie */ +#overlay { + filter:alpha(opacity=70); +} +.showOnFocus { + filter:alpha(opacity=50); +} +.showOnFocus:hover { + filter:alpha(opacity=100); +} +.blurOnFocus{ + filter:alpha(opacity=100); +} +.showOnFocus:hover { + filter:alpha(opacity=40); +} +#absnav3{ display:none; } diff --git a/thawab-data/themes/neo/static/img/about.gif b/thawab-data/themes/neo/static/img/about.gif new file mode 100644 index 0000000..a9c8358 Binary files /dev/null and b/thawab-data/themes/neo/static/img/about.gif differ diff --git a/thawab-data/themes/neo/static/img/book.png b/thawab-data/themes/neo/static/img/book.png new file mode 100644 index 0000000..2ed1d07 Binary files /dev/null and b/thawab-data/themes/neo/static/img/book.png differ diff --git a/thawab-data/themes/neo/static/img/close.gif b/thawab-data/themes/neo/static/img/close.gif new file mode 100644 index 0000000..151c252 Binary files /dev/null and b/thawab-data/themes/neo/static/img/close.gif differ diff --git a/thawab-data/themes/neo/static/img/code.gif b/thawab-data/themes/neo/static/img/code.gif new file mode 100644 index 0000000..22a394d Binary files /dev/null and b/thawab-data/themes/neo/static/img/code.gif differ diff --git a/thawab-data/themes/neo/static/img/external.gif b/thawab-data/themes/neo/static/img/external.gif new file mode 100644 index 0000000..fdaa851 Binary files /dev/null and b/thawab-data/themes/neo/static/img/external.gif differ diff --git a/thawab-data/themes/neo/static/img/favicon.ico b/thawab-data/themes/neo/static/img/favicon.ico new file mode 100644 index 0000000..cc9d95a Binary files /dev/null and b/thawab-data/themes/neo/static/img/favicon.ico differ diff --git a/thawab-data/themes/neo/static/img/forum.gif b/thawab-data/themes/neo/static/img/forum.gif new file mode 100644 index 0000000..cd3af8e Binary files /dev/null and b/thawab-data/themes/neo/static/img/forum.gif differ diff --git a/thawab-data/themes/neo/static/img/get_ffx.png b/thawab-data/themes/neo/static/img/get_ffx.png new file mode 100644 index 0000000..adc01a6 Binary files /dev/null and b/thawab-data/themes/neo/static/img/get_ffx.png differ diff --git a/thawab-data/themes/neo/static/img/go-back.png b/thawab-data/themes/neo/static/img/go-back.png new file mode 100644 index 0000000..af1b730 Binary files /dev/null and b/thawab-data/themes/neo/static/img/go-back.png differ diff --git a/thawab-data/themes/neo/static/img/go-next.png b/thawab-data/themes/neo/static/img/go-next.png new file mode 100644 index 0000000..01b7cf4 Binary files /dev/null and b/thawab-data/themes/neo/static/img/go-next.png differ diff --git a/thawab-data/themes/neo/static/img/go-up.png b/thawab-data/themes/neo/static/img/go-up.png new file mode 100644 index 0000000..b413828 Binary files /dev/null and b/thawab-data/themes/neo/static/img/go-up.png differ diff --git a/thawab-data/themes/neo/static/img/home.png b/thawab-data/themes/neo/static/img/home.png new file mode 100644 index 0000000..8c848bc Binary files /dev/null and b/thawab-data/themes/neo/static/img/home.png differ diff --git a/thawab-data/themes/neo/static/img/loading.gif b/thawab-data/themes/neo/static/img/loading.gif new file mode 100644 index 0000000..513a3ec Binary files /dev/null and b/thawab-data/themes/neo/static/img/loading.gif differ diff --git a/thawab-data/themes/neo/static/img/logo.png b/thawab-data/themes/neo/static/img/logo.png new file mode 100644 index 0000000..04ae78a Binary files /dev/null and b/thawab-data/themes/neo/static/img/logo.png differ diff --git a/thawab-data/themes/neo/static/img/mail.gif b/thawab-data/themes/neo/static/img/mail.gif new file mode 100644 index 0000000..3c26f06 Binary files /dev/null and b/thawab-data/themes/neo/static/img/mail.gif differ diff --git a/thawab-data/themes/neo/static/img/print.png b/thawab-data/themes/neo/static/img/print.png new file mode 100644 index 0000000..eb47921 Binary files /dev/null and b/thawab-data/themes/neo/static/img/print.png differ diff --git a/thawab-data/themes/neo/static/img/quote.gif b/thawab-data/themes/neo/static/img/quote.gif new file mode 100644 index 0000000..aaaaa7c Binary files /dev/null and b/thawab-data/themes/neo/static/img/quote.gif differ diff --git a/thawab-data/themes/neo/static/img/rpm.gif b/thawab-data/themes/neo/static/img/rpm.gif new file mode 100644 index 0000000..9354e5d Binary files /dev/null and b/thawab-data/themes/neo/static/img/rpm.gif differ diff --git a/thawab-data/themes/neo/static/img/scrolldn.png b/thawab-data/themes/neo/static/img/scrolldn.png new file mode 100644 index 0000000..39209d4 Binary files /dev/null and b/thawab-data/themes/neo/static/img/scrolldn.png differ diff --git a/thawab-data/themes/neo/static/img/scrollup.png b/thawab-data/themes/neo/static/img/scrollup.png new file mode 100644 index 0000000..e0076e4 Binary files /dev/null and b/thawab-data/themes/neo/static/img/scrollup.png differ diff --git a/thawab-data/themes/neo/static/img/search.png b/thawab-data/themes/neo/static/img/search.png new file mode 100644 index 0000000..afb9588 Binary files /dev/null and b/thawab-data/themes/neo/static/img/search.png differ diff --git a/thawab-data/themes/neo/static/img/spacer.png b/thawab-data/themes/neo/static/img/spacer.png new file mode 100644 index 0000000..f3133d5 Binary files /dev/null and b/thawab-data/themes/neo/static/img/spacer.png differ diff --git a/thawab-data/themes/neo/static/img/text.png b/thawab-data/themes/neo/static/img/text.png new file mode 100644 index 0000000..07eb189 Binary files /dev/null and b/thawab-data/themes/neo/static/img/text.png differ diff --git a/thawab-data/themes/neo/static/img/tree.png b/thawab-data/themes/neo/static/img/tree.png new file mode 100644 index 0000000..225aca9 Binary files /dev/null and b/thawab-data/themes/neo/static/img/tree.png differ diff --git a/thawab-data/themes/neo/static/img/up.gif b/thawab-data/themes/neo/static/img/up.gif new file mode 100644 index 0000000..2beaedb Binary files /dev/null and b/thawab-data/themes/neo/static/img/up.gif differ diff --git a/thawab-data/themes/neo/static/img/valid-css-blue.gif b/thawab-data/themes/neo/static/img/valid-css-blue.gif new file mode 100644 index 0000000..c373b2a Binary files /dev/null and b/thawab-data/themes/neo/static/img/valid-css-blue.gif differ diff --git a/thawab-data/themes/neo/static/img/valid-xhtml10-blue.gif b/thawab-data/themes/neo/static/img/valid-xhtml10-blue.gif new file mode 100644 index 0000000..cee6742 Binary files /dev/null and b/thawab-data/themes/neo/static/img/valid-xhtml10-blue.gif differ diff --git a/thawab-data/themes/neo/static/main.css b/thawab-data/themes/neo/static/main.css new file mode 100644 index 0000000..eb0ee37 --- /dev/null +++ b/thawab-data/themes/neo/static/main.css @@ -0,0 +1,493 @@ +.clear {clear:both; padding-bottom:2px;} + +a img { border: none; } +a[href] { text-decoration: none; color:#150;} +a[href]:hover { text-decoration: underline; } +a[target] { background: transparent url('img/external.gif') top left no-repeat; padding-left:12px;} + +body { + font-family: "amiri", "Liberation Sans", "KacstOne", "Simplified Naskh", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "sans", "Sans"; + background:#ccc; + margin:0;padding:0;border:0; +} +h1, h2{ +margin:0; +padding:0; +color:#303030; +} +.clearer { +display: block;height: 12px; +} +#async_tips_div { + display:none; + position: absolute; + background-color:#ffe; + left:20%; + margin:0; padding:3px 10px; + border:2px solid #aa7; + border:2px solid rgba(170, 170, 119, 0.6); +} +.match { background-color:#acf; } +.term0 { background-color:#acf; } +.term1 { background-color:#fca; } +.term2 { background-color:#cfa; } +.term3 { background-color:#fac; } +.term4 { background-color:#afc; } +.term5 { background-color:#caf; } + + +.quran { + font-family: "amiri-quran", "amiri", "Simplified Naskh", "me_quran", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "Serif"; + font-size: 150%; + color: #240; + background: linear-gradient(#fffffc,#ffc); +padding: 4px; +border: 1px solid #ff0; +border-radius: 4px; +box-shadow: 0px 0px 10px -4px #ff0; +} + +blockquote { + border:3px dotted #aaa; + background:#ddd url('img/quote.gif') top left no-repeat; + background-color:rgba(190, 230, 190, 0.4); + padding:5px 50px; +} + +input.search_input { + font-family: "amiri", "Simplified Naskh", "me_quran", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "Serif"; +padding: 3px 30px 3px 3px; +border-radius: 0px 5px 5px 0px; + font-size: 12pt; + color: rgb(0, 0, 0); + border: 1px solid #56C016; + background: #fff url("img/search.png") no-repeat right 3px; + width: 576px; + box-shadow: 0px -3px 1px 0px #d1d1d1 inset; + transition: all 400ms ease-in-out; +float: right; +margin-top: 2px; +} +input:focus.search_input, +input:hover.search_input { + border: 1px solid #56C016; +} + +input.submit_button { +float: left; +height: 36px; +border: 1px solid rgb(86, 192, 22); +background: linear-gradient(#80f838,#64e318); +margin: 2px -1px 0px 0px; +width: 56px; +border-radius: 5px 0px 0px 5px; +color:#fff; +text-shadow: 0px 0px 3px #255D04; + +font-size: 14px; +} +#loading { + display:none; + background:transparent url('img/loading.gif') center center no-repeat; + position:absolute; + top:16px; + left:8px; + margin:20px auto; + width:32px; + height:32px; +} +#logo { + background:transparent; + position:absolute; + top:8px; + right:8px; + height:48px; + font-size:24px; + line-height: 100%; + text-decoration: none; + vertical-align:middle; + margin:0;padding:0;border:0; +} +#logo img {border:0; vertical-align: middle;} +#results { +background: #A3F96F; +color: #fff; +overflow: hidden; +position: fixed; +display:none; +top: 87px; +left: 37px; +width: 500px; +height: 300px; +margin: 0; +padding: 0; +border: 1px solid #56C016; +border-top: 0; +z-index: 1; +} +#nominisearch { + display:none; + text-align:right; + width:200px; + margin:0;padding:0; +} + +#minisearch { +background: linear-gradient(#9cfb63e6,#64e318e6); +color: #fff; +overflow: hidden; +position: fixed; +top: 50px; +left: 48px; +width: 250px; +height: 32px; +margin: 0; +padding: 0; +border: 1px solid #56C016; +z-index: 1; +border-radius: 2px; +box-shadow: 0px 0px 10px -5px #170; +} +#minisearch form { + margin:0;border:0;padding:0; +} +#minisearch input { + background: #fff6; + width: 244px; + height: 26px; + border: 1px solid #ffffff4d; + margin: 1px; + border-radius: 2px; +} + +#searchHelpDiv { display:none;} + +#searchHelp { + background:#ffffa0; + padding:16px; + -webkit-border-radius:8px; + -moz-border-radius:8px; + border-radius:8px; +} +#searchHelpArrow { + background:transparent url('img/up.gif') right top no-repeat; + margin:0 24px; + height:16px; + width:32px; +} + + + + +#container { + background-image: radial-gradient(circle 1000px at top,#fff 0%,#ccc 40%); +min-height: 100vh; +} + +#footer { +background: linear-gradient(#eee,#ddd); +color: #111; +margin: 36px; +text-align: left; +height: 35px; +text-shadow: 1px 1px 0px #ccc; +padding: 6px; +border: 1px solid #555; +border-radius: 4px; +box-shadow: 0px 0px 6px -1px #666; +} +#footer img {border:0;} +#contentheaderHome { +text-align: center; +padding: 32px; +} +#contentheader { +text-align: right; +position: fixed; +top: 0px; +left: 24px; +right: 24px; +background: linear-gradient(#9cfb63,#64e318); +border: 1px solid #56c016; +border-top: none; +border-radius: 0 0 4px 4px; +color: #fff; +text-shadow: 0px 0px 3px #255D04; +padding: 4px 12px; +font-size: 20px; +max-height: 37px; +overflow-x: auto; +overflow-y: hidden; +} +#contentheader a, #toolbar a.button { +color: #fff; +text-shadow: 0px 0px 3px #255D04; +background: linear-gradient(rgba(255, 255, 255, 0.4),#64e318); +border: 1px solid #64e318; +border-radius: 5px; +padding: 0 10px; +box-shadow: 0px 0px 5px -3px #150; +display:inline-block; +white-space: nowrap; +vertical-align: top; +} +#contentheader a:hover, #toolbar a.button:hover{ +text-decoration: none; +border: 1px solid rgba(17, 85, 0, 0.33); +box-shadow: 0px 0px 3px -1px #150; +} +#contentheader a:active, #toolbar a.button:active{ +background: linear-gradient(#64e318,rgba(255, 255, 255, 0.4)); +} +#contentheader a.home{ + +} +#contentheaderHome .logo { + width: 256px; + height: 256px; + cursor: pointer; +} +#toolbar { +position: fixed; +top: 46px; +right: 35px; +left: 35px; +border: 1px solid #56c016; +border-top: 0; +background: linear-gradient(rgba(156, 251, 99, 0.9),rgba(100, 227, 24, 0.93)); +border-bottom: none; +padding: 5px 3px; +} +a.inactive { +filter: grayscale(100%); +opacity: 0.5; +cursor: not-allowed; +} +#toolbar a.button { +margin-left: 10px; +border-radius: 2.5px; +box-shadow: 0px 0px 2.5px -1.5px #150; +padding: 2px 10px; +} +#contentbodyHome { + margin:0;padding:0 16px;border:0; +} +#contentbody { +background: #fff; +margin: 74px 35px; +border: 1px solid #56c016; +border-radius: 0 0 4px 4px; +padding: 0 12px; +min-height: 100vh; +box-shadow: 0 0px 30px -10px #150; +} +/* nav */ +.navtoolbar { + overflow:hidden; + width:100%;height:32px; + background:#acf; + background:rgba(240,240,255,0.4); + z-index:10; +} + +.navtoolbar span, #searchbar span, #tailnav span{ + float:right; +} +.navtoolbar span.otherside, #searchbar span.otherside, #tailnav span.otherside{ + float:left; +} + +.navtoolbar a, #tailnav a { + padding-right:24px;padding-left:16px; +} +.navtoolbar a.prevLink, #tailnav a.prevLink { + background:url('img/go-prev.gif') center right no-repeat; +} +.navtoolbar a.upLink, #tailnav a.upLink{ +background:url('img/go-up.gif') center right no-repeat; +} +.navtoolbar a.homeLink, #tailnav a.homeLink{ +background:url('img/go-home.gif') center right no-repeat; +} +.navtoolbar a.nextLink, #tailnav a.nextLink{ +background:url('img/go-next.gif') center left no-repeat; +padding-left:24px;padding-right:16px; +} +#overlay { + display: none; + overflow:hidden; + position: absolute; + left:0; top:0; + z-index:1000; + background:#fff; +} + + + +.Box { + border-radius: 5px; + margin:20px; + background-color:#eef7ee; +position: relative; +box-shadow: 0px 0px 10px -4px #150; +} + +.Box h2 { +margin: 0; +background: linear-gradient(#80f838,#64e318); +color: #fff; +text-shadow: 0px 0px 3px #255D04; +padding: 0 12px; +border: 1px solid rgb(86, 192, 22); +border-radius: 5px 5px 0px 0px; +} +.Box div.info { +position: absolute; +top: 10px; +left: 10px; +color: #150; +opacity: 0.5; +} +.Box div.info:hover { +opacity:1; +} +#kutubListing input { +top: 10px; +left: 10px; +position: absolute; +} +#kutubListing ul { + display:inline; + } +#kutubListing ul li { +list-style: none; +} +#kutubListing ul li a { + display:inline; + font-size:18px; + display:block; + float:right; + margin:18px 16px; + padding-top:64px; + width:130px; + height:50px; + text-align:center; + background: url('img/book.png') no-repeat center 8px,radial-gradient(#eef7ee,#e3f9cd); +border: 1px solid #e3f9cd; +border-radius: 8px; +box-shadow: 0px 0px 5px -2px #657556; +transition: all 400ms ease-in-out; +} + +#kutubListing ul li a:hover{ +background: url('img/book.png') no-repeat center 8px,radial-gradient(#eef7ee,#bcdb9d); +border: 1px solid #bcdb9d; +text-decoration: none; +} + +table,th,td { + border:none; + border-collapse:collapse; + padding:6px; +} + +table { +width: 96%; +background: #666; +border-radius: 6px; +box-shadow: 1px 1px 10px rgba(0,0,0,0.3); +} +thead, tfoot {color:white; } + +tbody td, tbody th{ background-color:#ddd; } + +tbody th { color:#222;} +tbody td{border:1px solid #000;} +tbody td:first-child{border-right:none;} +tbody td:last-child{border-left:none;} + +tbody tr:nth-child(odd) td { background-color:#eee; color:#222} + +tfoot td, tfoot th {border:none; font-size:130%} + +#SearchContainer_tab{ +overflow-y: scroll; +height: 79vh; +direction: rtl; +} +.searchItem { +display: block; +width: auto; +border-radius: 3px; +background: url("img/text.png") no-repeat scroll right 10px, #fff linear-gradient(#eef7ee,#e3f9cd) !important; +border: 1px solid #e3f9cd; +margin: 14px 10px 12px 8px; +box-shadow: 0px 0px 5px -2px #657556; +padding-right: 48px; +transition: all 400ms ease-in-out; +} +.searchItem h2{ +background: transparent none repeat scroll 0% 0%; +border: none; +color: #150; +text-shadow: 2px 1px 1px #ccc; +font-weight: normal; +padding-top: 1px; +} +.searchItem span{ +color: #950000; +} + +.searchItem:hover { +background: url("img/text.png") no-repeat scroll right 10px, #fff linear-gradient(#eef7ee,#bcdb9d) !important; +border: 1px solid #bcdb9d; +text-decoration: none !important; +} +.searchItem:active { +background: url("img/text.png") no-repeat scroll right 10px, #fff linear-gradient(#bcdb9d,#eef7ee) !important; +border: 1px solid #bcdb9d; +text-decoration: none !important; +} +#SearchPages span { + display:inline; + float:right; + margin:0px; + text-align:center; + background: #def; + color:#777; + border:2px solid #acd; + width:42px; + cursor:pointer; +} +#SearchPages a{ + padding:0 0.5em; +} + +#SearchPages a.current{ + background: #acf; + color:#000; +} + +.mini table, .mini th, .mini td { padding:0; } +.mini tbody a{ + display:block; + padding:0 5px; + white-space:nowrap; + width:380px; overflow:hidden; +} +.mini #SearchPages span { font-size:80%; } + +.mini #SearchPages a{ padding:0 0.2em; } + +#SearchContainer.mini { + padding:36px 0 0 0; + overflow:hidden; +} +#rollup { + background: transparent url('img/close.gif') 0 0 no-repeat; + position:absolute; + width:22px; + height:22px; + left:0; + bottom:0; +} diff --git a/thawab-data/themes/neo/static/main.js b/thawab-data/themes/neo/static/main.js new file mode 100644 index 0000000..ef23c7c --- /dev/null +++ b/thawab-data/themes/neo/static/main.js @@ -0,0 +1,219 @@ +/** + * + * copyright ? 2010 ojuba.org, Muayyad Saleh Alsadi + * + **/ +var klass="class"; +var animations={}, ani_c=0, init_ls=[]; +var autoscroll_dir=0, autoscroll_px=5; +var overlay_d; + +function text_keyup(e, evt, func, bool) { + var charCode = (evt.which) ? evt.which : event.keyCode + if (charCode == 27) { // catch ESC key and clear input + e.value = ""; + if (bool == true) { + func("", true); + }else{ + func(""); + } + return false; + } +} + +// fake trim for IE +if (!Boolean(String.prototype.trim)) { + String.prototype.trim = function() { + return this.replace(/^\s+/, '').replace(/\s+$/, ''); + }; +} + +function get_url_vars() { + var vars = {}, i,j, e; + var s= document.location.search; + if (!s || s.length[0]==0 || s[0]!="?" ) return vars; + var a = s.slice(1).split('&'); + for(i = 0; i < a.length; ++i) { + e = a[i].split("=",2); + if (e && e.length==2) vars[decodeURI(e[0])] = decodeURI(e[1]); + } + return vars; +} + +function animation_loop() { + var i,a,fn,r; + for (i in animations) { + a=animations[i]; + fn=a[0]; + r=fn(a.slice(1)); + if (r==false) delete animations[i]; + } + setTimeout(animation_loop, 100); +} + +function slide_down_cb(args) { + var o=args[0], h=args[1], px=args[2], cb=args[3]; + var t=o.offsetHeight+px; + if (t>=h) t=h; + o.style.height=t+"px"; + if (t==h) { + --ani_c; + if (cb) cb(); + return false; + } + return true +} + +function slide_down(o, h, px, cb) { + var d; + if (!h || h<0) h=o.offsetHeight; + if (!px || px<0) px=h/5.0; + if (px<1.0) px=1; + d=o.style.display; + o.style.display="none"; + o.style.height=px+"px"; + o.style.display=d; + animations["_"+(++ani_c)]=[slide_down_cb, o, h, px, cb]; +} + +function get_scroll_width() { + var w = window.pageXOffset || document.body.scrollLeft || document.documentElement.scrollLeft; + return w ? w : 0; +} + +function get_scroll_height() { + var h = window.pageYOffset || document.body.scrollTop || document.documentElement.scrollTop; + return h ? h : 0; +} + +function autoscroll_up_cb() { + + if (autoscroll_dir!=-1) return true; + var h=get_scroll_height(),t=h-autoscroll_px; + if (t<=0) {t=0; autoscroll_dir=0;} + window.scroll(0,t); + return true +} +function autoscroll_down_cb() { + if (autoscroll_dir!=1) return true; + var h=get_scroll_height(),t=h+autoscroll_px, hm=document.body.scrollHeight; + if (t>=hm) {t=hm; autoscroll_dir=0;} + window.scroll(0,t); + return true +} +function import_script(url){ + var t = document.createElement("script"); + t.type="text/javascript"; + t.src = url; + document.body.appendChild(t); +} +function overlay_init() { + var d = document.createElement("div"); + d.id="overlay"; + d.style.width=document.documentElement.scrollWidth+"px"; + d.style.height=document.documentElement.scrollHeight+"px"; + document.body.appendChild(d); + overlay_d=d; + window.onresize = resize_cb; +} +function resize_cb() { + overlay_d.style.width=document.documentElement.scrollWidth+"px";; + overlay_d.style.height=document.documentElement.scrollHeight+"px"; +} + +function getAjax(url, q, success, failure) { + if (window.XMLHttpRequest){ + // code for standard browsers Firefox, Chrome, Opera, Safari, and even IE7+ + xmlhttp=new XMLHttpRequest(); + } else { + // code for IE6, IE5 + xmlhttp=new ActiveXObject("Microsoft.XMLHTTP"); + } + xmlhttp.onreadystatechange=function() { + if(xmlhttp.readyState==4) { + if (xmlhttp.status==200) success(xmlhttp.responseText); + else if (failure) failure(); + } + } + s=""; + for (var i in q) { s+="&"+i+"="+encodeURIComponent(q[i]); } + s=url+"?"+s.slice(1); + xmlhttp.open("GET",s,true); + xmlhttp.send(null); +} +var needs_external_json=false; + +var fromJson = function(t) { + return eval("("+t+")"); +} + +function getJson(url, q, success, failure) { + s=function(t){return success(fromJson(t));}; + getAjax(url, q, s, failure); +} + +function html_escape(s) { + return s.replace("&","&").replace("<","<").replace(">",">"); +} + +function re_escape(s) { return s.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1') } + +function search_entry_focus(e) { + e.setAttribute(klass, "search_active"+( e.getAttribute(klass) || "" ).replace("search_active","").replace("search_inactive","")); + if (e.value == "?? ?????") e.value = ""; +} +function search_entry_blur(e) { + e.setAttribute(klass, "search_inactive"+( e.getAttribute(klass) || "" ).replace("search_active","").replace("search_inactive","")); + if (e.value == "") e.value = "?? ?????"; +} + +function rm_class(e,c) { + e.setAttribute(klass, ( e.getAttribute(klass) || "" ).replace(c,"")); + return false; +} + +function init_get_by_class() { +if (document.getElementsByClassName == undefined) { + document.getElementsByClassName = function(className) + { + var hasClassName = new RegExp("(?:^|\\s)" + className + "(?:$|\\s)"); + var allElements = document.getElementsByTagName("*"); + var results = []; + + var element; + for (var i = 0; (element = allElements[i]) != null; i++) { + var elementClass = element.className; + if (elementClass && elementClass.indexOf(className) != -1 && hasClassName.test(elementClass)) + results.push(element); + } + + return results; + } +} +} + +function init() { + try { + if (JSON) { + var t=JSON.parse('"t"'); + fromJson = function(t) { + return JSON.parse(t); + } + } else needs_external_json=true; + } catch(e) { + needs_external_json=true; + } + init_get_by_class(); + if (document.body.getAttribute(klass)!='body') { + klass="className"; /* hack for ie */ + } + setTimeout(animation_loop, 100); + animations["_s_up"]=[autoscroll_up_cb]; + animations["_s_dn"]=[autoscroll_down_cb]; + overlay_init(); + var i; + for (i in init_ls) init_ls[i](); +} + +window.onload = init; + diff --git a/thawab-data/themes/neo/static/manual/all.css b/thawab-data/themes/neo/static/manual/all.css new file mode 100644 index 0000000..508a11e --- /dev/null +++ b/thawab-data/themes/neo/static/manual/all.css @@ -0,0 +1,120 @@ +.clear {clear:both; padding-bottom:2px;} +pre, code { direction: ltr;} +a img { border: none; } +a[href] { text-decoration: none; color:#150;} +a[href]:hover { text-decoration: underline; } +a[target] { background: transparent url('../img/external.gif') top left no-repeat; padding: 0 0 0 12px;} + +body { + font-family: "amiri", "Liberation Sans", "KacstOne", "Simplified Naskh", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "sans", "Sans"; + background:#999; + margin:0;padding:3em;border:0; +} +.export { + background:#fff; + margin:0;padding:3em; + border: #aaa solid 4px; +} +h1, h2, h3, h4 { + font-family: "amiri", "Liberation Sans", "KacstOne", "Simplified Naskh", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "sans", "Sans", sans-serif; + color: #437f22; + font-weight: bold; +} +div.toc { + width:30%; float:left; + background: #cda; + padding:20px;margin:10px; + border: #999 solid 2px; +} + +div.footnotes { + margin: 0.5em -2em 0; + padding: 1em 4em 0; + border-top: 2px dotted #CCC +} + +pre { + background: #cda; + border: #cdc solid 2px; + margin: 2em; + padding: 0.5em; +} + +table { + margin: 2em; + padding:0; + border-collapse:collapse; +} +tr { padding:0; margin:0; border:0;} +td,th { + border: 2px solid #999; + padding:2px 10px; margin:0; +} +th { background: #cda; } + +/* syntax highlighting code */ +.code .br0 { color: #66cc66; } +.code .co1 { color: #808080; font-style: italic; } +.code .co2 { color: #808080; font-style: italic; } +.code .co3 { color: #808080; } +.code .coMULTI { color: #808080; font-style: italic; } +.code .es0 { color: #000099; font-weight: bold; } +.code .kw1 { color: #b1b100; } +.code .kw2 { color: #000000; font-weight: bold; } +.code .kw3 { color: #000066; } +.code .kw4 { color: #993333; } +.code .kw5 { color: #0000ff; } +.code .me1 { color: #006600; } +.code .me2 { color: #006600; } +.code .nu0 { color: #cc66cc; } +.code .re0 { color: #0000ff; } +.code .re1 { color: #0000ff; } +.code .re2 { color: #0000ff; } +.code .re3 { color:#ff3333; font-weight:bold; } +.code .re4 { color: #009999; } +.code .st0 { color: #ff0000; } +.code .sy0 { color: #66cc66; } + +/* notes */ +.noteclassic, .noteimportant, .notewarning, .notetip { + margin: 2em; + margin-left: auto; + margin-right: auto; + width: 70% !important; + min-height: 40px; + clear: both; + text-align: justify; + vertical-align: middle; + border-collapse: collapse; + border: 2px solid #999; + padding: 15px 60px 15px 20px; + background-position: right 50%; + background-repeat: no-repeat; + -moz-border-radius: 20px; + -khtml-border-radius: 20px; + border-radius: 20px; +} + +.noteclassic { + /*border: 1px solid #99D;*/ + background-color: #eef; + background-image: url(images/note.png); +} + +.noteimportant { + /*border: 1px solid #ff0;*/ + background-color: #ffc; + background-image: url(images/important.png); +} + +.notewarning { + /*border: 1px solid #d99;*/ + background-color: #fdd; + background-image: url(images/warning.png); +} + +.notetip { + /*border: 1px solid #9d9;*/ + background-color: #dfd; + background-image: url(images/tip.png); +} diff --git a/thawab-data/themes/neo/static/manual/images/important.png b/thawab-data/themes/neo/static/manual/images/important.png new file mode 100644 index 0000000..dc8c8a4 Binary files /dev/null and b/thawab-data/themes/neo/static/manual/images/important.png differ diff --git a/thawab-data/themes/neo/static/manual/images/note.png b/thawab-data/themes/neo/static/manual/images/note.png new file mode 100644 index 0000000..df1e0a9 Binary files /dev/null and b/thawab-data/themes/neo/static/manual/images/note.png differ diff --git a/thawab-data/themes/neo/static/manual/images/tip.png b/thawab-data/themes/neo/static/manual/images/tip.png new file mode 100644 index 0000000..2000f20 Binary files /dev/null and b/thawab-data/themes/neo/static/manual/images/tip.png differ diff --git a/thawab-data/themes/neo/static/manual/images/warning.png b/thawab-data/themes/neo/static/manual/images/warning.png new file mode 100644 index 0000000..3c8a37d Binary files /dev/null and b/thawab-data/themes/neo/static/manual/images/warning.png differ diff --git a/thawab-data/themes/neo/static/manual/manual.html b/thawab-data/themes/neo/static/manual/manual.html new file mode 100644 index 0000000..d93ef76 --- /dev/null +++ b/thawab-data/themes/neo/static/manual/manual.html @@ -0,0 +1,273 @@ + + + + +???? ??????? ???? + + + + + +
+ +
+
???? ?????????
+
+ +
+
+ + +

???? ??????? ????? ????

+
+ +
+ +

?????

+
+ +
+ +

????

+
+ +

+?????? ????? ???? ?????? ?????? ????? ?????. ????? ??? ??????? ?????? ?? ???? ?? ????? ?????. +

+ +

+????? ???? ?????? ?? ??? ????? ????? ?????? ?? ???? ?????? ???? ???? ??? ?????? ???? ??? ?????? ?????? ????? ?? ?? ????? ?? ?? ????? ??? ???? ?????. +

+ +

+?? ?????? ?? ????? ????? ???? ????? ??? ??? ????? ?? ?? ????? ???? ????? ?? ??? ??? ???? ????? ?????? ????? ???? ???? ??? ??????? ????? ???????? ???? ????? ???? ?????? ??????? ?????? ???? ???? ??? (???? ???? ???? ?????? ?? ??????? ???? ???? ?? ?????? ?? ?????) +

+ +

+????? ????? ??? ????? ?? ???? ???? ?????? ?????? ?? ??????? (?? ????? ?????? ???????? ????????). ????? ??????? ???? ???? 500 ????? ??? (???? ????? ??? ??? ????? ?? ?????? ????). +

+ +

+

+?????? ????? ???? ?? ??? ????. ????: ?? ???? ?? ????? ??? ??? ???? ?? ???? ?? ???? ?????. + +

+

+ +

+????? ??????? ??? ?????? ??????? ???? ?????? ?? ?? ????? ???????? ?? ?? ??? ???? ???? ????? ???? ????. +

+ +

+

?? ??? ????? ?? ????? ??? ????????. +

+

+ +

+????? ???? ?????? ???? ??? ????? ??? ???? ?? ??? ?????? ????? ????? ????? ?????? ?? ???? ??? ??????? ??? ?? ?????? ??????. ??????? ???? ?????? ??? ??? ??????? ?? ?????? ??????? ??? ??????? ???? ?????? ????? ???????? ??? ????? ??? ?? ??????? ?? ?? ??????? ?? ???????: ????? ?? ?????? ??????? ?????? ?? ?? ?????? ??????. +

+ +
+ +

??????

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
????? ??? ??????? ??? ???? ???? ??????
& ? ????? ???? ?? ????? ??? ????? ??? ???? & ??? ?? ????? ???? ????? ?????? ? ?????
&~ ????? ????? ???? ?? ????? ????? ?? ????? ?? ????? ??? ?????? ??? ???? &~ ??? ?? ????? ???? ???? ?????? ????? ?? ????? ???? ?????
| ?? ????? ???? ???? ?? ????? ?? ???? ?? ????? ???? | ?????? ?? ????? ???? ???? ?????? ?? ???? ????????
! ????? ????? ??? ?? ????? ?? ????? ???? | ?????? ! ?????? ?? ????? ???? ???? ?????? ?? ???? ???????? ??? ???? ?? ?? ????? ???? ????????
* ?? ??? ??? ?? ???? ?? ?????? ????* ???? ?? ????? ?? ???? ? ???? ??? ?????? ?? ?????? ????
? ??? ???? ??? ???? ????? ??? ???? ?? ????? ??? ?? ??? ????
^ ??? ????? ??? ?????? ??? ????? ??????? ???? ??? ?????^3 ????? ???? ????? 3 ????? ??? ?????? ??? ???????
????: ????? ?????? ????? ?? ?????? ??????? ????? ?????? ????:(????? ???????? | ????? ?????) ????? ?? ?????? ?? ???? ??????? ?? ???? ????
?????: ????? ?? ???????? ??? ????? ?? ?????? ??????? ?????:(??? ?????) ????? ?? ???? ??? ????? ??? ?? ?????? ???????
+ +

+ +

????? ????? ??? ~ ???? ???? ??? ????? & ?? ??????? ??????? ??? ????? ??? ?? SHIFT+Z ?? ???? ???????? ??????? QWERTY +

+

+ +
+ +

??????????? ????????

+
+ +

+??? ????? ???? ?? ???? ???? ??? ????? ??? ????? ??? ????? ??? (?????? ?&?) ?? ??? ?????? ??????? ???? ????? ?? ??? ??????? ??? (??? ?????? ????? ????) ???? ??? ????? ???? ??? ?? ????? ?? ????? ???? ?? ????? ??????? ???? ????? ????? ?? ???????? ?? ??? ?? ??? ???????? ??? (?? ???? ???? ??? & ?????) ???? ?? ????? ????? ????? ??? ????? ?????? ?????? ?? ?????? ?????. +

+ +

+????? ??????? ??????? ???? (?????? ?|?) ??? ????? ???? ????? ?? ??? ??????? ???? ?? ???? ???? ???? ?? | ?? ?????? ???? ?? ????? ???? ???????? ??? ?????? ????? ????. +

+ +

+???? ??? ???????? ??? ????? ?????? ?!? ???? ???????? ??? ?? ??????? ???? ?????? ! ?????? ???? ??????? ???? ????? ???? ?????? ????? ?? ??? ????? ?? ????? ???? ??????. +

+ +

+???? ??????? ??????? ??? ?? ???????? ???????? ???? (?????? | ????) ! ??????. +

+ +

+??????? ??????? ???? ??? ????? ?????? ?????? ???? ?????? ?????? ???? ???? ????? ?? ?????. +

+ +

+????? ?????? ???? ?????? ?? ??????? ??? ????? ????? ?? ????? : ???? ?????:???? ?????? ????? ?? ????? ???? ?????? ?? ??????? ??? ????? ?? ????? ?? ??????? ??? ?????? ?? ???? ????? ????? ????? ?????:(??? ?????) +

+ +

+

+????? ?? ?????:??? ????? ??? ?????? ?? ????? ???? ????? ?? ????? ?? ???? ??? ??? ???? ??? ??? ????? ?? ???? ?? ??????? + +

+

+ +

+????? ????? ???? ????? ??? ??? ??? ?????? ??? ???? ???? ?? : ???? +

+
    +
  • ??? ????? ????:????_???????
    +
    • +
  • ??? ????? ????:????? ????????
    +
    • +
+ +

+ +

+????? ?? ??? ????? ????:????_??????? ??? ?????? ??? ????? ????? _ ???? ?? ??? ?????? ?? ???? ??? ??????? ??? ???? ???? ????? ???? + +

+

+ +

+

+????? ????? ?? ???? ?? ???? ??? ??????? ?? ???? ??? ????? (????:????_??????? | ????:????_????) +???? ????? ??????? ???? ??? ! ???? ??? ????? ! ????:????_??????? ???? ?? ??? ????? ?? ?? ???? ??? ???? ??????? + +

+

+ +
+ +

?????? ??? ?????

+
+ +

+?? ???? ??? ????? ?? ?????? (???? ?? ???? ?????? ????? ???? ???? ?? ????? ??????? ???? ?? ????????) ??? +????? ???? ??? ?? ????? ???? ?? ???? ????????? ???????? ??? ????? ?????? ????? ?? ???? ?? ????. +

+ +

+???? ??? ????? ?? ???? db ???? ???????? ?????? ?????? ????. +

+ +

+???????? ?????? ????? ?? +

+
    +
  1. ???? .thawab ???? ?????? ????? ????? ?????????.
    +
    2. +
  2. ???? thawab-data ??????? ????? ???????? ???? ???? ????
    +
    3. +
  3. ???? thawab-data ?? ?? ?? ????? ?????? ?? C ??? Z
    +
    4. +
+ +
+ +

????????? ?? ???????

+
+ +

+???? ??????? ??? ??????? ??? ?????? .bok ????? ???? ?????? ????? ???????? ?? ?????? ??????? ?? +???????? ?? ???????? 1). +????? ??? ?? ???? ?? ????????? ??????? ?? ?? ???? ??? ????? bok ???????? ?? ?????? ????? ??? ????? ????? ????? ??? ?? ??????? Add ???? ???????? ?? ?????? ?????? ???? ???? ??????? Convert. +

+ +
+ +

?? ???? ??????

+
+ +

+???? ??? ????? ?? ??? ??????: + +

+ + +
+ +

????? ???? ?????

+
+ +

+??? ????? ?????? ?? ????? ??? ???? ?? ???? ?????? ??? ???? ??? ?? ???? ????? ????. ???????? ??? ???? ????? ?? ????? ???? ???? ??? ?? ???? ????? Index ?? ???? ??? ?? ??? ????? ??????? queue new books ?? ??? ?????? ??? ????? ??? ???????? ?? ?????? ???????? ????. +

+ +
+ +

?????? ?? ???? ?? ????

+
+ +

+?? ???? ?????? ?? ????? ??? ??? (??? ??? ????? ???? ?????? ?????? ????????? ?? ????? ????? ???? ????? whoosh ??? ????? ???? ??? ?????? ?? ???? ????) ???? ??? ???? index ?? ????? ????? ???????. +

+ +
+
+
1) +???? ??????? ?? ???? ??????? ?????? ?? ?????? ?? ?? ???? islamport
+
+
+ + diff --git a/thawab-data/themes/neo/static/print.css b/thawab-data/themes/neo/static/print.css new file mode 100644 index 0000000..40001af --- /dev/null +++ b/thawab-data/themes/neo/static/print.css @@ -0,0 +1,3 @@ +.noprint { display: none; } +#wrapper, #container { background:#fff; } + diff --git a/thawab-data/themes/neo/static/th-main.js b/thawab-data/themes/neo/static/th-main.js new file mode 100644 index 0000000..edfb441 --- /dev/null +++ b/thawab-data/themes/neo/static/th-main.js @@ -0,0 +1,153 @@ +/** + * + * copyright ? 2010 ojuba.org, Muayyad Saleh Alsadi + * + **/ +var resultsPerPage=50; +var async_tips_div, mouse_x, mouse_y; + +function main_search_row_factory(u, bu, r) { + return "

"+ html_escape(r.t)+"

"+html_escape(r.k).replace(new RegExp('_', 'g'), ' ')+" - "+html_escape(r.a)+" ("+(r.y || "-")+") \n" + + +} +var search_row_factory=main_search_row_factory; +var search_done=function() {}; + +function showSearchPage(hash, pg){ + var j,i=(pg-1)*resultsPerPage,o,h,l; + var u=script+'/ajax/searchExcerpt/'+hash+'/',bu=script+'/view/'; + /*l=document.getElementById("loading"); + l.style.display="block";*/ + window.scroll(100,0); + getJson("/json/searchResults", {h:hash,i:i,c:resultsPerPage}, + function (d) { + var c=d.c,a=d.a; + o=document.getElementById("SearchResults"); + h="" + o.innerHTML=h; + for (j=0;j 10) { pages = 10; } + document.getElementById("SearchPagesCount").innerHTML=pages; + o=document.getElementById("SearchPages"); + h=''; + o.innerHTML=h; + if (d.c>0) { + for (i=1;i<=pages;++i) h+=''+(i)+''; + o.innerHTML=h; + showSearchPage(d.h,1); + + if (main) {se_t.style.display="block";} + } + + search_done(); + document.location="#searchResults"; + }, + function () { + + search_done(); + } + ); + return false; + +} + +function kutubFilter(q) { + var o=document.getElementById("kutubList"); + var old=o.innerHTML; + var l=document.getElementById("loading"); + /*l.style.display="block";*/ + getAjax(script+"/ajax/kutub", {q:q}, + function (d) { + o.innerHTML=d; + }, + function () { + o.innerHTML=old; + } + ); + + return false; +} + +function moveMouse(E) { + var e=window.event || E; + mouse_x=window.pageXOffset+e.clientX; + mouse_y=window.pageYOffset+e.clientY; +} + +function asynctip(e) { + + async_tips_div.style.top=(mouse_y+e.offsetHeight+5)+"px"; + async_tips_div.innerHTML="..."; + async_tips_div.style.display="block"; + u=e.getAttribute('rel'); + getAjax(u, { }, + function (d) { + async_tips_div.innerHTML=d; + + }, + function () { + async_tips_div.style.display="none"; + + } + ); + +} + +function asynctip_hide(e) { + async_tips_div.style.display="none"; +} + +function async_tips_init() { + var d=document.createElement("div"); + d.id="async_tips_div"; + d.style.width="60%"; + d.style.display="none"; + document.body.appendChild(d); + async_tips_div=d; + + if (document.addEventListener) { + document.addEventListener('mousemove',moveMouse,false); + } else { + document.attachEvent('onmousemove',moveMouse); + } +} +init_ls.push(async_tips_init); + diff --git a/thawab-data/themes/neo/static/th-view.js b/thawab-data/themes/neo/static/th-view.js new file mode 100644 index 0000000..b03ef0f --- /dev/null +++ b/thawab-data/themes/neo/static/th-view.js @@ -0,0 +1,164 @@ +/** + * + * copyright ? 2010 ojuba.org, Muayyad Saleh Alsadi + * + **/ +var last_highlighted=""; +var th_hash; +function mini_search_row_factory(u, bu, r) { + return ""+ html_escape(r.t)+""+html_escape(r.r)+"\n"; +} +function mini_search_row_factory_st(u, bu, r) { + return ""+ html_escape(r.t)+""+html_escape(r.r)+"\n"; +} +resultsPerPage=10; // defined in main.js +search_row_factory=(is_static)?mini_search_row_factory_st:mini_search_row_factory; +function doMiniSearch(q) { + doSearch(q+" ????:"+kitabId, false); +} + +function view_cb(h) { + var n,b; + var spacer = ""; + window.scroll(0,0); + if (! h) h="_i0"; + th_hash=h; + getJson(script+"/json/view/"+kitabUid+"/"+h, {}, + function (d) { + document.getElementById("maincontent").innerHTML=arabic_numbers(d.content); + document.getElementById("subtoc").innerHTML=arabic_numbers(d.childrenLinks); + + b=spacer+ d.breadcrumbs.replace(/>/g,spacer); + if (d.breadcrumbs){ + document.getElementById("breadcrumbs").innerHTML=arabic_numbers(b);} + else {document.getElementById("breadcrumbs").innerHTML="";} + + n=document.getElementById("prevLink"); + n.setAttribute('title', d.prevTitle); + if (d.prevTitle) {n.setAttribute('class', 'button'); + n.setAttribute('href', d.prevUrl);} + else { n.setAttribute('class', 'button inactive'); + n.setAttribute('href','javascript:void(0)'); } + + n=document.getElementById("upLink"); + n.setAttribute('title', d.upTitle); + if (d.upUrl != window.location.hash) {n.setAttribute('class', 'button'); + n.setAttribute('href', d.upUrl);} + else { n.setAttribute('class', 'button inactive'); + n.setAttribute('href','javascript:void(0)'); } + + + n=document.getElementById("nextLink"); + n.setAttribute('title', d.nextTitle); + if (d.nextTitle) {n.setAttribute('class', 'button'); + n.setAttribute('href', d.nextUrl);} + else { n.setAttribute('class', 'button inactive'); + n.setAttribute('href','javascript:void(0)'); } + highlight_words(document.getElementById("maincontent"), highlighted, true); + }, + function () { + /* should show error */ + } + ); + + return false; +} +function arabic_numbers(string) { +/* FIX this code +string = string.replace(/0/g,"?"); +string = string.replace(/1/g,"?"); +string = string.replace(/2/g,"?"); +string = string.replace(/3/g,"?"); +string = string.replace(/4/g,"?"); +string = string.replace(/5/g,"?"); +string = string.replace(/6/g,"?"); +string = string.replace(/7/g,"?"); +string = string.replace(/8/g,"?"); +string = string.replace(/9/g,"?"); +*/ +return string; +} +function ajax_check_hash() { + var h=window.location.hash; + if (h==("#"+th_hash)) return true; + view_cb(h.slice(1)); + return true; +} + +var harakat="?????????"; + +function highlight_word(o, w, i) { + w=w.trim(); + if (w=="") return; + w=re_escape(w).replace(/(\\?.)/g, "$1[\-_"+harakat+"]*"); + w="("+w+")"; + var re = new RegExp( w, "gi"); + a=o.innerHTML.split(/(<\/?[^>]*>)/); + for (j in a) { + s=a[j]; + if (s && s[0]!="<") { + a[j]=s.replace(re, "$1"); + } + } + o.innerHTML=a.join(""); +} + +function highlight_words(o, w, scroll) { + var i,a=w.split(" "); + highlight_words_off(o); + for (i in a) { + highlight_word(o,a[i],i); + } + if (scroll) scroll_to_first_highlighted(); +} + +function scroll_to_first_highlighted() { + a=document.getElementsByClassName("highlight"); + for (j=0;j([^<>]*)<\/span>/gi, "$1"); +} + +var highlighting=false; + +function highlight_cb() { + if (highlighting) return true; + var q=document.getElementById('q').value; + if (q=="?? ?????") return true; + highlighting=true; + highlighted=q; + if (last_highlighted!=highlighted) { + last_highlighted=highlighted; + highlight_words(document.getElementById("maincontent"), highlighted, false); + } + highlighting=false; + return true; +} + + +function th_view_init() { + var l; + if (!is_static) { + l=document.location.toString(); + loc=window.location.hash.slice(1); + if (loc=="") document.location=l+"#_i0"; + else view_cb(loc); + } + /* hide mini-search if not indexed */ + if (!is_indexed) { + document.getElementById("minisearch").style.display="none"; + document.getElementById("nominisearch").style.display="block"; + } + highlighted=get_url_vars()["highlight"] || ""; + highlight_words(document.getElementById("maincontent"), highlighted, true); + last_highlighted=highlighted; +} +search_done=scroll_to_first_highlighted; +animations["_highlight"]=[highlight_cb]; +if (!is_static) animations["_ajax_check_hash"]=[ajax_check_hash]; +init_ls.push(th_view_init); diff --git a/thawab-data/themes/neo/templates/footer.html b/thawab-data/themes/neo/templates/footer.html new file mode 100644 index 0000000..392963f --- /dev/null +++ b/thawab-data/themes/neo/templates/footer.html @@ -0,0 +1,19 @@ +%if _r.rq.webapp._typ=='web': + +%end diff --git a/thawab-data/themes/neo/templates/layout.html b/thawab-data/themes/neo/templates/layout.html new file mode 100644 index 0000000..c352e39 --- /dev/null +++ b/thawab-data/themes/neo/templates/layout.html @@ -0,0 +1,43 @@ + + + +{{_r.title or '::'}} :: ???? :: + + + + + + + +{{!_r.render_css_links()}} +%if x_js_script: x_js_script() + +{{!_r.render_js_links('head')}} + + + + +{{!_r.render_js_links('begin')}} + + +%topnav() + +%if typ!="main": +%include minisearch +%end + +
+ +%include + +
+ +%include footer + +{{!_r.render_js_links('end')}} + + diff --git a/thawab-data/themes/default/templates/main.html b/thawab-data/themes/neo/templates/main.html similarity index 64% copy from thawab-data/themes/default/templates/main.html copy to thawab-data/themes/neo/templates/main.html index adcbf8b..0d5ab7b 100644 --- a/thawab-data/themes/default/templates/main.html +++ b/thawab-data/themes/neo/templates/main.html @@ -11,21 +11,24 @@ var script=''; get package contact us forum - code + code %end -
-

????? ???? - ??? ??? ????? ?? ????? ?????

-????? | ????? ???????? -
-
-

?????

-
-
- -   ???? ????????? ( ????? ??????? ) +
+ + +

????? ???? - ??? ??? ????? ?? ????? ?????

+ + + +
+
+???? ????????? ( ????? ??????? )
+ +
+
@@ -38,31 +41,35 @@ var script=''; ???? ?????????
- -