1. Made some changes to fonts.

2. Corrected id bug on create page. 3. Minor changes to database access.
sayedzeeshan · Mar 19, 2015 · 058fcd6 · 058fcd6
1 parent 467e41c
commit 058fcd6
Show file tree

Hide file tree

Showing 35 changed files with 231 additions and 160 deletions.
diff --git a/Aruuz.Website/App_Start/BundleConfig.cs b/Aruuz.Website/App_Start/BundleConfig.cs
@@ -45,7 +45,7 @@ public static void RegisterBundles(BundleCollection bundles)
                       "~/Content/bootstrap.css"));
 
             bundles.Add(new StyleBundle("~/Content/css_custom").Include(
-                     "~/Content/custom.css"));
+                     "~/Content/customnoto.css"));
 
 
             var commonStylesBundle = new CustomStyleBundle(BootstrapPath);

diff --git a/Aruuz.Website/Aruuz.Website.csproj b/Aruuz.Website/Aruuz.Website.csproj
@@ -370,6 +370,8 @@
     <Content Include="Content\bootstrap.css.map">
       <DependentUpon>bootstrap.css</DependentUpon>
     </Content>
+    <Content Include="fonts\amarnastaleeq-webfont.ttf" />
+    <Content Include="fonts\amarnastaleeq-webfont.woff" />
     <None Include="Properties\PublishProfiles\ftphome.pubxml" />
     <None Include="Properties\PublishProfiles\home.pubxml" />
     <None Include="Properties\PublishProfiles\LabProfile.pubxml" />

diff --git a/Aruuz.Website/Content/bootstrap.css b/Aruuz.Website/Content/bootstrap.css
diff --git a/Aruuz.Website/Content/bootstrap.css.map b/Aruuz.Website/Content/bootstrap.css.map
diff --git a/Aruuz.Website/Content/create.js b/Aruuz.Website/Content/create.js
@@ -44,17 +44,11 @@ $(window).load(function () {
     //$(".check").removeClass("hidden");
     var h = document.getElementsByTagName("body")[0];
     if ($("#poetrypanel").is(":visible")) {
-        var $span = $(".check2");
+       var $span = $(".check2");
         var max = 0;
         var width = 0;
         for (var i = 0; i < $span.length; i++) {
-            var s = document.createElement("span");
-            s.innerHTML = $span[i].innerHTML;
-            s.setAttribute("class", "urdu-large");
-            h.appendChild(s);
-            width = s.offsetWidth; //width for the default font
-            h.removeChild(s);
-
+            width = $span[i].offsetWidth;
             if (max < width) {
                 max = width;
             }
@@ -74,7 +68,6 @@ $(window).load(function () {
             $(".data").css("content", "");
             $(".data").css("display", "inline-block");
             $(".data").css("width", percentage + "%");
-
         }
     }
     else
@@ -83,12 +76,7 @@ $(window).load(function () {
         var max = 0;
         var width = 0;
         for (var i = 0; i < $span.length; i++) {
-            var s = document.createElement("span");
-            s.innerHTML = $span[i].innerHTML;
-            s.setAttribute("class", "urdu-medium");
-            h.appendChild(s);
-            width = s.offsetWidth; //width for the default font
-            h.removeChild(s);
+            width = $span[i].offsetWidth;
 
             if (max < width) {
                 max = width;
@@ -417,7 +405,7 @@ function publish() {
         <label for='poet-url' class='urdu-naskh-medium'>\
     فیسبک یا ویب سائٹ (شامل کرنا ضروری نہیں) \
     </label>\
-<input class = 'form-control data' placeholder = 'مثال: http://www.facebook.com/xyz'  id='poet-url'>\
+<input class = 'form-control data input-lg' placeholder = 'مثال: http://www.facebook.com/xyz'  id='poet-url' style='font-size:small; font-face:serif'>\
     <br>\
     <label for='title' class='urdu-naskh-medium'>\
     *عنوان \
@@ -491,9 +479,10 @@ function taqtiClicked() {
             var id = mat[1].replace(/[^0-9]/g, '');
             var met = mat[1].replace(/[0-9-]/g, '').replace(/[_]/g, ' ');
             var values = {
+                "id" : parseInt(id,10), // you want to use radix
                 "text": text,
                 "meter": met,
-                "id" : id
+                "isChecked": "false"
             }
             var idText =$(changed[i]).attr('id');
             sectionID = idText.substring(12, idText.length);
@@ -530,7 +519,13 @@ function dictionaryClicked() {
     $('#myModal').modal('toggle');
 }
 function reportClicked(e, name) {
-    var data = "<div class='modal-body urdu-medium'><label for='name-input' class='urdu-naskh-medium'>نام</label><input class = 'form-control data' id='name-input'></input><label for='email-input' class='urdu-naskh-medium'>ای-میل</label><input class = 'form-control data' id='email-input'></input> <label for='comments-input' class='urdu-naskh-medium'>تبصرہ </label><textarea class = 'form-control data' id='comments-input'></textarea></div>";
+    var data = "<div class='modal-body urdu-medium'>\
+        <label for='name-input' class='urdu-naskh-medium'> نام </label>\
+            <input class = 'form-control data input-lg urdu-medium' id='name-input'></input>\
+            <label for='email-input' class='urdu-naskh-medium'>ای-میل</label>\
+            <input class = 'form-control data input-lg' id='email-input' style='font-size:small'></input> \
+            <label for='comments-input' class='urdu-naskh-medium'>تبصرہ </label>\
+                <textarea class = 'form-control data urdu' id='comments-input'></textarea></div>";
 
     if (name != null)
     {
@@ -714,30 +709,71 @@ function modalButtonClicked() {
                 }, 2000);
                 $("#title").focus();
             }
-            else {
-
-                var values = {
-                    "title": $("#title").val(),
-                    "name": $("#poet-name").val(),
-                    "url": $("#poet-url").val(),
-                    "text": $("#inputTextRes").text(),
-                    "percentage": $("#percentage").text()
+            else
+                {
+                if ($("#poet-url").val() != '') {
+                    if (IsUrl($("#poet-url").val())) {
+                        var values = {
+                            "title": $("#title").val(),
+                            "name": $("#poet-name").val(),
+                            "url": $("#poet-url").val(),
+                            "text": $("#inputTextRes").text(),
+                            "percentage": $("#percentage").text()
+                        };
+
+                        var imgCode = "<div class='modal-body'> <img src='/icons/ajax-loader.gif'></img> </div>";
+                        $("#myModal div.modal-body").replaceWith(imgCode).delay(300);
+
+                        var url = "/mypoetry/publish";
+                        $.post(url, AddAntiForgeryToken(values), function (data) {
+                            $("#myModal div.modal-body").replaceWith(data);
+                            $("#button-label").replaceWith("<p id='button-label' class='urdu'>بند کریں</p>");
+                            $("#button-label").addClass("close-it");
+                            $("#myModal").addClass("opened");
+                            $("#linkbutton").addClass("disabled");
+                            $("#linkbutton2").addClass("disabled");
+
+
+                        });
+
+
+                    }
+                    else {
+
+                        $("#poet-url").after("<div id = 'temp' class = 'urdu-naskh-medium red'><p>ویب سائٹ درست لکھیں </p></div>").delay(2000);
+                        setTimeout(function () {
+                            $('.red').remove();
+                        }, 2000);
+                        $("#poet-url").focus();
+                    }
                 }
+                else
+                {
+                    var values = {
+                        "title": $("#title").val(),
+                        "name": $("#poet-name").val(),
+                        "url": $("#poet-url").val(),
+                        "text": $("#inputTextRes").text(),
+                        "percentage": $("#percentage").text()
+                    };
+
+                    var imgCode = "<div class='modal-body'> <img src='/icons/ajax-loader.gif'></img> </div>";
+                    $("#myModal div.modal-body").replaceWith(imgCode).delay(300);
+
+                    var url = "/mypoetry/publish";
+                    $.post(url, AddAntiForgeryToken(values), function (data) {
+                        $("#myModal div.modal-body").replaceWith(data);
+                        $("#button-label").replaceWith("<p id='button-label' class='urdu'>بند کریں</p>");
+                        $("#button-label").addClass("close-it");
+                        $("#myModal").addClass("opened");
+                        $("#linkbutton").addClass("disabled");
+                        $("#linkbutton2").addClass("disabled");
+
+
+                    });
 
-                var imgCode = "<div class='modal-body'> <img src='/icons/ajax-loader.gif'></img> </div>";
-                $("#myModal div.modal-body").replaceWith(imgCode).delay(300);
-
-                var url = "/mypoetry/publish";
-                $.post(url, AddAntiForgeryToken(values), function (data) {
-                    $("#myModal div.modal-body").replaceWith(data);
-                    $("#button-label").replaceWith("<p id='button-label' class='urdu'>بند کریں</p>");
-                    $("#button-label").addClass("close-it");
-                    $("#myModal").addClass("opened");
-                    $("#linkbutton").addClass("disabled");
-                    $("#linkbutton2").addClass("disabled");
-
-
-                });
+                }
+
             }
         }
     }
@@ -799,7 +835,6 @@ function IsUrl(url)
     }
 }
 function rowClicked(id) {
-
     var a = "#" + id;
     var OriginalContent = $(a).text().replace(/\s+/g, " ");
     OriginalContent = OriginalContent.substring(7, OriginalContent.length);

diff --git a/Aruuz.Website/Content/custom.css b/Aruuz.Website/Content/custom.css
@@ -6,6 +6,11 @@
         font-style: normal;
     }
 
+ @font-face {
+	font-family: amarnastaleeq-webfont;
+	src: url('../fonts/amarnastaleeq-webfont.ttf') format('truetype'), url('../fonts/amarnastaleeq-webfont.woff');
+}
+
 
 .urdu-naskh {
     direction: rtl;
@@ -24,7 +29,7 @@
     font-feature-settings: "ccmp" 0; /* Firefox 4.0 to 14.0 */
     direction: rtl;
     font-size: larger;
-    font-family: 'Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-family: 'amarnastaleeq-webfont','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }
 
 .urdu-sp {
@@ -33,7 +38,7 @@
     font-feature-settings: "ccmp" 0; /* Firefox 4.0 to 14.0 */
     direction: rtl;
     font-size: x-large;
-    font-family: 'Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-family:'amarnastaleeq-webfont', 'Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }
 
 .urdu-medium {
@@ -42,7 +47,7 @@
     font-feature-settings: "ccmp" 0; /* Firefox 4.0 to 14.0 */
      direction: rtl;
     font-size: large;
-    font-family: 'Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-family: 'amarnastaleeq-webfont','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }
 
 .urdu-huge {
@@ -51,7 +56,7 @@
      font-feature-settings: "ccmp" 0; /* Firefox 4.0 to 14.0 */
      direction: rtl;
     font-size: xx-large;
-    font-family: 'Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-family: 'amarnastaleeq-webfont','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }
 
 .urdu-large {
@@ -60,7 +65,7 @@
     font-feature-settings: "ccmp" 0; /* Firefox 4.0 to 14.0 */
     direction: rtl;
     font-size: x-large;
-    font-family: 'Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-family: 'amarnastaleeq-webfont','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }
 
 .urdu-small {
@@ -69,7 +74,7 @@
     font-feature-settings: "ccmp" 0; /* Firefox 4.0 to 14.0 */
     direction: rtl;
     font-size: medium;
-    font-family: 'Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-family: 'amarnastaleeq-webfont','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }
 
 .sidebar-nav-fixed {

diff --git a/Aruuz.Website/Content/customnoto.css b/Aruuz.Website/Content/customnoto.css
@@ -1,72 +1,97 @@
-  @font-face {
-  font-family: 'Noto Nastaliq Urdu Draft';
+  /*@font-face {
+  font-family: 'amarnastaleeq-webfont';
   font-style: normal;
   font-weight: normal;
          src: url('../fonts/NotoNastaliqUrduDraft.woff') format('woff');
+}*/
+
+  @font-face {
+	font-family: amarnastaleeq-webfont;
+	src: url('../fonts/amarnastaleeq-webfont.ttf') format('truetype'), url('../fonts/amarnastaleeq-webfont.woff');
 }
 
-    @font-face {
-        font-family: nafees-naskh-regular;
-        src: url('../fonts/nafees-web-naskh-regular.ttf') format('truetype');
-        font-weight: normal;
+  /*
+  @font-face {
+        font-family: Amiri;
+        src:  url('../fonts/amiri-regular.ttf') format('truetype');
+        font-style: normal;
         font-style: normal;
+        font-weight: 400;
+        unicode-range: U+0600-06FF, U+200C-200E, U+2010-2011, U+FB50-FDFF, U+FE80-FEFC;
     }
+    */
+  @font-face {
+  font-family: 'Amiri';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Amiri'), local('Amiri-Regular'), url(http://fonts.gstatic.com/s/amiri/v7/7uGqdnOlOhcFsG_5_cvW9A.woff2) format('woff2');
+  unicode-range: U+0600-06FF, U+200C-200E, U+2010-2011, U+FB50-FDFF, U+FE80-FEFC;
+}
+
 
 
 .urdu-naskh {
     direction: rtl;
     font-size: larger;
-    font-family: 'nafees-naskh-regular';
+    font-family: 'Amiri';
 }
 
 .urdu-naskh-medium {
     direction: rtl;
     font-size: medium;
-    font-family: 'nafees-naskh-regular';
+    font-family: 'Amiri';
+}
+
+.urdu-naskh-small {
+    line-height: 120%;
+    direction: rtl;
+    font-size: smaller;
+    font-family: 'Amiri';
 }
 
 
+
 .urdu {
-    line-height: 200%;
+    line-height: 160%;
      direction: rtl;
     font-size: large;
-    font-family: 'Noto Nastaliq Urdu Draft','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-family: 'amarnastaleeq-webfont','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }
 
 .urdu-sp {
-    line-height: 200%;
+    line-height: 160%;
      direction: rtl;
     font-size: large;
-    font-family: 'Noto Nastaliq Urdu Draft','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-family: 'amarnastaleeq-webfont','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }
 
 
 .urdu-medium {
     line-height: 150%;
     direction: rtl;
-    font-size: small;
-    font-family: 'Noto Nastaliq Urdu Draft','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-size: medium;
+    font-family: 'amarnastaleeq-webfont','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }
 
 .urdu-huge {
-    line-height: 225%;
+    line-height: 160%;
     direction: rtl;
     font-size: x-large;
-    font-family: 'Noto Nastaliq Urdu Draft','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-family: 'amarnastaleeq-webfont','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }
 
 .urdu-large {
-    line-height: 225%;
+    line-height: 180%;
     direction: rtl;
     font-size: larger;
-    font-family: 'Noto Nastaliq Urdu Draft','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-family: 'amarnastaleeq-webfont','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }
 
 .urdu-small {
     line-height: 70%;
     direction: rtl;
     font-size: smaller;
-    font-family: 'Noto Nastaliq Urdu Draft','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
+    font-family: 'amarnastaleeq-webfont','Jameel Noori Nastaleeq','nafees-naskh-regular', 'Alvi Nastaleeq', 'Alvi Lahori Nastaleeq','AlQalam Taj Nastaleeq', 'Nafees Nastaleeq','Urdu Typesetting', 'Urdu Naskh Asiatype', Tahoma, sans-serif;
 }