diff --git a/GanjooRazor/Pages/AudioClip.cshtml b/GanjooRazor/Pages/AudioClip.cshtml
index d85452f6..6ed50329 100644
--- a/GanjooRazor/Pages/AudioClip.cshtml
+++ b/GanjooRazor/Pages/AudioClip.cshtml
@@ -149,7 +149,7 @@
-
+
diff --git a/GanjooRazor/Pages/FAQ.cshtml b/GanjooRazor/Pages/FAQ.cshtml
index 49ec91c5..019ed328 100644
--- a/GanjooRazor/Pages/FAQ.cshtml
+++ b/GanjooRazor/Pages/FAQ.cshtml
@@ -16,7 +16,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/GanjooRazor/Pages/Simi.cshtml b/GanjooRazor/Pages/Simi.cshtml
index 89a90b6a..5262f045 100644
--- a/GanjooRazor/Pages/Simi.cshtml
+++ b/GanjooRazor/Pages/Simi.cshtml
@@ -17,7 +17,7 @@
-
+
}
+
+@if (Model.GanjoorPage != null && Model.GanjoorPage.Poem != null)
+{
+
+}
diff --git a/GanjooRazor/Pages/_FooterPartial.cshtml.cs b/GanjooRazor/Pages/_FooterPartial.cshtml.cs
index 9a5cd844..e20dc9e6 100644
--- a/GanjooRazor/Pages/_FooterPartial.cshtml.cs
+++ b/GanjooRazor/Pages/_FooterPartial.cshtml.cs
@@ -1,9 +1,12 @@
using Microsoft.AspNetCore.Mvc.RazorPages;
+using RMuseum.Models.Ganjoor.ViewModels;
namespace GanjooRazor.Pages
{
public class _FooterPartialModel : PageModel
{
public bool StickyEnabled { get; set; }
+
+ public GanjoorPageCompleteViewModel GanjoorPage { get; set; }
}
}
diff --git a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
index 489f679c..cb57d7ae 100644
--- a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
+++ b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
@@ -318,7 +318,6 @@
-
حذف شمارهها
@if (Model.LoggedIn)
{
@@ -725,7 +724,7 @@
-
+
+ اعلانهای من
}
diff --git a/GanjooRazor/wwwroot/js/bk.js b/GanjooRazor/wwwroot/js/bk.js
index 12fdb59f..b1ca8517 100644
--- a/GanjooRazor/wwwroot/js/bk.js
+++ b/GanjooRazor/wwwroot/js/bk.js
@@ -84,6 +84,7 @@ function bshfarsinum(englishnum) {
function btshmr_internal(poemId) {
var bnum = getElements("bnum");
if (bnum.length != 0) {
+ lineNumbers = false;
for (var i = 0; i < bnum.length; ++i) {
bnum[i].remove();
}
@@ -91,35 +92,43 @@ function btshmr_internal(poemId) {
for (var i = 0; i < bnumdiv.length; ++i) {
bnumdiv[i].remove();
}
- document.getElementById("bnum-button").innerHTML = 'شمارهگذاریformat_list_numbered_rtl';
- setCookie("lineNumbers", "false", 365);
- return true;
}
- document.getElementById("bnum-button").innerHTML = 'حذف شمارههاformat_list_numbered_rtl';
- var msr1s = getElements("m1", "b2", "n", "l");
- if (msr1s.length == 0) return true;
- var j = 0;
- var k = 1;
- for (var i = 0; i < msr1s.length; ++i) {
- if (msr1s[i].className != "b2") {
- if (msr1s[i].className != "m1") {
- msr1s[i].innerHTML = '' + msr1s[i].innerHTML;//no alt, so that when user copies text does not appear in the copied content
+ else {
+ lineNumbers = true;
+ var msr1s = getElements("m1", "b2", "n", "l");
+ if (msr1s.length == 0) return true;
+ var j = 0;
+ var k = 1;
+ for (var i = 0; i < msr1s.length; ++i) {
+ if (msr1s[i].className != "b2") {
+ if (msr1s[i].className != "m1") {
+ msr1s[i].innerHTML = '' + msr1s[i].innerHTML;//no alt, so that when user copies text does not appear in the copied content
+ }
+ else {
+ msr1s[i].parentElement.innerHTML = '' + msr1s[i].parentElement.innerHTML;//no alt, so that when user copies text does not appear in the copied content
+ }
+
+ document.getElementById("bnum" + String(i + 1)).style.background = 'url(' + coupletNumImage(bshfarsinum(String(j + 1)), "red") + ')';
+ j++;
}
else {
- msr1s[i].parentElement.innerHTML = '' + msr1s[i].parentElement.innerHTML;//no alt, so that when user copies text does not appear in the copied content
+ msr1s[i].innerHTML = '' + msr1s[i].innerHTML;
+ document.getElementById("bnum" + String(i + 1)).style.background = 'url(' + coupletNumImage("بند " + bshfarsinum(String(k)), "blue") + ')';
+ k++;
+ j = 0;
}
-
- document.getElementById("bnum" + String(i + 1)).style.background = 'url(' + coupletNumImage(bshfarsinum(String(j + 1)), "red") + ')';
- j++;
- }
- else {
- msr1s[i].innerHTML = '' + msr1s[i].innerHTML;
- document.getElementById("bnum" + String(i + 1)).style.background = 'url(' + coupletNumImage("بند " + bshfarsinum(String(k)), "blue") + ')';
- k++;
- j = 0;
}
}
- setCookie("lineNumbers", "true", 365);
+ setCookie("lineNumbers", lineNumbers ? "true" : "false", 365);
+ if (lineNumbers) {
+ btnLineNumbers.classList.remove("color-disabled");
+ btnLineNumbers.classList.add("color-white");
+ }
+ else {
+ btnLineNumbers.classList.remove("color-white");;
+ btnLineNumbers.classList.add("color-disabled")
+ }
+
return true;
}