diff --git a/.htaccess b/.htaccess index 5a0c61cdc..35c319148 100644 --- a/.htaccess +++ b/.htaccess @@ -21,6 +21,7 @@ Header append Vary Accept env=REQUEST_image + Header set X-Robots-Tag "noindex, nofollow" for "cdn.orient.tm" AddType image/webp .webp diff --git a/config/cms.php b/config/cms.php index cbc94c730..e87e76b10 100644 --- a/config/cms.php +++ b/config/cms.php @@ -384,7 +384,7 @@ return [ | */ - 'enableSafeMode' => null, + 'enableSafeMode' => false, //null /* |-------------------------------------------------------------------------- diff --git a/plugins/rainlab/blog/components/RssFeed.php b/plugins/rainlab/blog/components/RssFeed.php index 0f161830c..d592259cb 100644 --- a/plugins/rainlab/blog/components/RssFeed.php +++ b/plugins/rainlab/blog/components/RssFeed.php @@ -136,7 +136,7 @@ class RssFeed extends ComponentBase $this->postPage = $this->page['postPage'] = $this->property('postPage'); $this->category = $this->page['category'] = $this->loadCategory(); $this->posts = $this->page['posts'] = $this->listPosts(); -$this->page['language'] = \App::getLocale(); + $this->page['language'] = \App::getLocale(); $this->page['link'] = $this->pageUrl($this->blogPage); $this->page['rssLink'] = $this->currentPageUrl(); //Carbon::setLocale('en'); @@ -163,8 +163,11 @@ $this->page['language'] = \App::getLocale(); /* * Add a "url" helper attribute for linking to each post and category */ + $posts->each(function($post) { $post->setUrl($this->postPage, $this->controller); + $locale = $post->locale; + $post->url = sprintf("https://orient.tm/%s/post/%d/%s", $locale, $post->id, $post->slug); }); return $posts; diff --git a/plugins/rainlab/blog/components/rssfeed/google.htm b/plugins/rainlab/blog/components/rssfeed/google.htm index 2614bac8c..b30b06553 100644 --- a/plugins/rainlab/blog/components/rssfeed/google.htm +++ b/plugins/rainlab/blog/components/rssfeed/google.htm @@ -3,10 +3,12 @@ xmlns:media="http://search.yahoo.com/mrss/"> {{ this.page.meta_title ?: this.page.title }}{% if category %}:{{category.name}}{% endif %} - {{ link }} + {{ rssLink }} {{ this.page.meta_description ?: this.page.description }} {{language}} + copiright + {{ posts|length > 0 ? posts.first.rss_date : '' }} {% for post in posts %} {{ post.title }} diff --git a/plugins/rainlab/blog/models/Post.php b/plugins/rainlab/blog/models/Post.php index 25e93cc8d..f22311c51 100644 --- a/plugins/rainlab/blog/models/Post.php +++ b/plugins/rainlab/blog/models/Post.php @@ -638,14 +638,19 @@ class Post extends Model if ($category !== null) { $category = Category::find($category); - $categories = $category->getAllChildrenAndSelf()->lists('id'); - if (!$categories) { - $categories[] = $category->id; + + if ($category !== null) { + + $categories = $category->getAllChildrenAndSelf()->lists('id'); + if (!$categories) { + $categories[] = $category->id; + } + // dd($categories); + $query->whereHas('categories', function ($q) use ($categories) { + $q->whereIn('id', $categories); + }); } - // dd($categories); - $query->whereHas('categories', function ($q) use ($categories) { - $q->whereIn('id', $categories); - }); + } if ($select) { diff --git a/plugins/tps/tps/Plugin.php b/plugins/tps/tps/Plugin.php index 639a134f1..00fc0051b 100644 --- a/plugins/tps/tps/Plugin.php +++ b/plugins/tps/tps/Plugin.php @@ -8,6 +8,7 @@ class Plugin extends PluginBase { return [ 'Tps\Tps\Components\MediaView' => 'mediaView', + 'Tps\Tps\Components\ExpertForm' => 'expertForm', ]; } diff --git a/plugins/tps/tps/plugin.yaml b/plugins/tps/tps/plugin.yaml index 6d07ebadf..9cf5ac1ad 100644 --- a/plugins/tps/tps/plugin.yaml +++ b/plugins/tps/tps/plugin.yaml @@ -36,6 +36,19 @@ navigation: icon: icon-question permissions: - media.authors + main-menu-item2: + label: FAQ + url: tps/tps/faqcontroller + icon: icon-question + sideMenu: + side-menu-item: + label: 'FAQ category' + url: tps/tps/faqcategorycontroller + icon: icon-sitemap + main-menu-item3: + label: 'Expert Form' + url: tps/tps/expertformcontroller + icon: icon-comments-o permissions: media.media: tab: Media diff --git a/plugins/tps/tps/updates/version.yaml b/plugins/tps/tps/updates/version.yaml index 501b389a9..beefb4dc6 100644 --- a/plugins/tps/tps/updates/version.yaml +++ b/plugins/tps/tps/updates/version.yaml @@ -36,3 +36,27 @@ 1.0.13: - 'Updated table tps_tps_media' - builder_table_update_tps_tps_media_2.php +1.0.14: + - 'Created table tps_tps_faq_category' + - builder_table_create_tps_tps_faq_category.php +1.0.15: + - 'Created table tps_tps_faq' + - builder_table_create_tps_tps_faq.php +1.0.16: + - 'Updated table tps_tps_faq' + - builder_table_update_tps_tps_faq.php +1.0.17: + - 'Updated table tps_tps_faq' + - builder_table_update_tps_tps_faq_2.php +1.0.18: + - 'Updated table tps_tps_faq' + - builder_table_update_tps_tps_faq_3.php +1.0.19: + - 'Updated table tps_tps_faq' + - builder_table_update_tps_tps_faq_4.php +1.0.20: + - 'Created table tps_tps_expert_form' + - builder_table_create_tps_tps_expert_form.php +1.0.21: + - 'Updated table tps_tps_expert_form' + - builder_table_update_tps_tps_expert_form.php diff --git a/themes/modern2/assets/new/jquery.js b/themes/modern2/assets/new/jquery.js index c4c6022f2..7ea6a68f2 100644 --- a/themes/modern2/assets/new/jquery.js +++ b/themes/modern2/assets/new/jquery.js @@ -1,2 +1,2 @@ /*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="
",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="
",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0 { const photoScrollerContainer = new Select(".photo-scroller").select(); -photoScrollerContainer.addEventListener("click", (e) => { - if ( - !e.target.classList.contains("photo-scroller-next") && - !e.target.classList.contains("photo-scroller-prev") - ) { - photoScroller.classList.remove("active"); - document.body.style.overflow = "visible"; - } -}); +if (photoScrollerContainer) { + photoScrollerContainer.addEventListener("click", (e) => { + if ( + !e.target.classList.contains("photo-scroller-next") && + !e.target.classList.contains("photo-scroller-prev") + ) { + photoScroller.classList.remove("active"); + document.body.style.overflow = "visible"; + } + }); +} const trendingSwiper = new Swiper(".trendingSwiper", { slidesPerView: 1, diff --git a/themes/modern2/config/lang.yaml b/themes/modern2/config/lang.yaml index 61c8d3a9c..d71da3d23 100644 --- a/themes/modern2/config/lang.yaml +++ b/themes/modern2/config/lang.yaml @@ -19,6 +19,25 @@ en: post.not_found: 'No posts found' footer.copyright: 'ORIENT - INFORMATION AGENCY' paginate.from: 'from' + #[component.expert_form] + expert_form.name: 'Your name' + expert_form.phone: 'Your phone number' + expert_form.email: 'Your email' + expert_form.message: 'Your message' + expert_form.name_error: 'Enter your name' + expert_form.phone_error: 'Enter your phone number' + expert_form.email_error: 'Enter your email' + expert_form.message_error: 'Enter your message' + expert_form.send: 'Send' + expert_form.name_placeholder: 'Pascal' + expert_form.phone_placeholder: 'Your contact number' + expert_form.email_placeholder: 'Your email address' + expert_form.message_placeholder: 'Ask your question' + expert_form.success_title: 'Ask an expert' + expert_form.success_text: 'Your message was successfully delivered' + expert_form.success_close_modal: 'Close a window' + expert_form.captcha: 'Protection' + expert_form.captcha_placeholder: 'Numbers from the picture' ru: site.name: 'Ориент' site.slogan: 'Наш ориентир то, что сближает людей' @@ -40,4 +59,22 @@ ru: post.not_found: 'Записей не найдено' footer.copyright: 'ORIENT - ИНФОРМАЦИОННОЕ АГЕНТСТВО' paginate.from: 'из' - + #[component.expert_form] + expert_form.name: 'Ваше имя' + expert_form.phone: 'Ваш телефон' + expert_form.email: 'Ваш email' + expert_form.message: 'Ваше сообщение' + expert_form.name_error: 'Введите свое имя' + expert_form.phone_error: 'Ваш телефон' + expert_form.email_error: 'Ваш email' + expert_form.message_error: 'Ваше сообщение' + expert_form.send: 'Отправить' + expert_form.name_placeholder: 'Паскаль' + expert_form.phone_placeholder: 'Ваш контактный номер' + expert_form.email_placeholder: 'Ваш адрес электронной почты' + expert_form.message_placeholder: 'Задайте свой вопрос' + expert_form.success_title: 'Спроси эксперта' + expert_form.success_text: 'Ваше сообщение успешно доставлено' + expert_form.success_close_modal: 'Закрыть окно' + expert_form.captcha: 'Проверка' + expert_form.captcha_placeholder: 'Цифры с картинки' diff --git a/themes/modern2/config/settings.yaml b/themes/modern2/config/settings.yaml index 227c6950b..150a8ad46 100644 --- a/themes/modern2/config/settings.yaml +++ b/themes/modern2/config/settings.yaml @@ -60,4 +60,33 @@ tabs: label: Top section cateegory default: events span: left - + officeIsLocated: + tab: Contact us + label: The office is located at + default: г. Ашхабад, проспект Махтумкули, 72 + span: right + workingHours: + tab: Contact us + label: Working hours + default: c 09:00 до 18:00 + span: left + editorialEmail: + tab: Contact us + label: Editorial Email + default: ny.orienttm@gmail.com + span: right + emailTheAdministration: + tab: Contact us + label: Email of the administration + default: ny.orienttm@gmail.com + span: left + editorialPhone: + tab: Contact us + label: Editorial Phone + default: +993 65 50-42-48 + span: right + administrationPhone: + tab: Contact us + label: Administration phone + default: +993 65 50-42-48 + span: left diff --git a/themes/modern2/layouts/new/master-inside.htm b/themes/modern2/layouts/new/master-inside.htm index 42d5fce8d..223d71112 100644 --- a/themes/modern2/layouts/new/master-inside.htm +++ b/themes/modern2/layouts/new/master-inside.htm @@ -22,6 +22,7 @@ default = 0 {% partial 'new/head' %} {% component 'SeoCmsPage' %} + {% styles %} @@ -120,6 +121,7 @@ default = 0 + {% framework extras %} {% scripts %} diff --git a/themes/modern2/layouts/new/master.htm b/themes/modern2/layouts/new/master.htm index 256704e6d..0b81e99f9 100644 --- a/themes/modern2/layouts/new/master.htm +++ b/themes/modern2/layouts/new/master.htm @@ -23,6 +23,36 @@ random = 0 height: 100%; margin: auto 0 0 0; } + + + .btn-wrapper { + display: flex; + flex-direction: row; + } + + .btn { + background: white; + border-radius: 20px; + border: 1px solid #504f4f; + display: flex; + align-items: center; + padding: 5px; + margin: 5px; + width: 50%; + + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + } + + .btn img { + height: 80%; + width: auto; + margin-right: 3px; + } + + {% styles %} diff --git a/themes/modern2/meta/menus/event_menu.yaml b/themes/modern2/meta/menus/event_menu.yaml index 2de3c15f8..9e94272e8 100644 --- a/themes/modern2/meta/menus/event_menu.yaml +++ b/themes/modern2/meta/menus/event_menu.yaml @@ -2,16 +2,16 @@ items: - title: 'В помощь экспортерам' type: url - url: /ru/new/posts/news/pomosh-eksporteram + url: /ru/posts/news/pomosh-eksporteram code: '' viewBag: locale: en: title: 'Export Promotion' - url: /en/new/posts/news/pomosh-eksporteram + url: /en/posts/news/pomosh-eksporteram tm: title: 'Eksporty ösdürmek' - url: /tm/new/posts/news/pomosh-eksporteram + url: /tm/posts/news/pomosh-eksporteram isHidden: '0' cssClass: '' isExternal: '0' diff --git a/themes/modern2/meta/menus/new-top-menui.yaml b/themes/modern2/meta/menus/new-top-menui.yaml index 42147a75d..647386b42 100644 --- a/themes/modern2/meta/menus/new-top-menui.yaml +++ b/themes/modern2/meta/menus/new-top-menui.yaml @@ -1,54 +1,42 @@ items: - title: Новости - nesting: null type: url - url: /ru/new/posts/news + url: /ru/posts/news code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: News - url: /en/new/posts/news + url: /en/posts/news tm: title: Habarlar - url: /tm/new/posts/news + url: /tm/posts/news isHidden: '0' cssClass: '' isExternal: '0' items: - title: События - nesting: null type: url - url: /ru/new/posts/news/events + url: /ru/posts/news/events code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Events - url: /new/posts/news/events + url: /en/posts/news/events tm: title: Çäreler - url: /tm/new/posts/news/events + url: /tm/posts/news/events isHidden: '0' cssClass: '' isExternal: '0' - title: Экономика - nesting: null type: url - url: /ru/new/posts/news/economy + url: /ru/posts/news/economy code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: @@ -56,19 +44,15 @@ items: url: '' tm: title: Ykdysadyýet - url: /tm/new/posts/news/ykdysadyyet + url: /tm/posts/news/ykdysadyyet isHidden: '0' cssClass: '' isExternal: '0' - title: Общество - nesting: null type: url - url: /ru/new/posts/news/society + url: /ru/posts/news/society code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: @@ -76,348 +60,296 @@ items: url: '' tm: title: Jemgyýet - url: /tm/new/posts/news/jemgyyet + url: /tm/posts/news/jemgyyet isHidden: '0' cssClass: '' isExternal: '0' - title: Культура - nesting: null type: url - url: /ru/new/posts/news/culture + url: /ru/posts/news/culture code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Culture - url: /en/new/posts/news/culture + url: /en/posts/news/culture tm: title: Medeniýet - url: /tm/new/posts/news/medeniyet + url: /tm/posts/news/medeniyet isHidden: '0' cssClass: '' isExternal: '0' - title: 'Новости бизнеса' - nesting: null type: url - url: /ru/new/posts/news/novosti-biznesa + url: /ru/posts/news/novosti-biznesa code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: 'Business news' - url: /en/new/posts/news/business-news + url: /en/posts/news/business-news tm: title: 'Biznes habarlary' - url: /tm/new/posts/news/biznes-habarlary + url: /tm/posts/news/biznes-habarlary isHidden: '0' cssClass: '' isExternal: '0' - title: Спорт - nesting: null type: url - url: /ru/new/posts/news/sport + url: /ru/posts/news/sport code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Sport - url: /en/new/posts/news/sport + url: /en/posts/news/sport tm: title: Sport - url: /tm/new/posts/news/sport + url: /tm/posts/news/sport + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Наука + type: url + url: /ru/posts/news/nauka + code: '' + viewBag: + locale: + en: + title: Science + url: /en/posts/news/science + tm: + title: 'Ylym Bilim' + url: '' isHidden: '0' cssClass: '' isExternal: '0' - title: Экомир - nesting: null type: url - url: /ru/new/posts/news/eco-world + url: /ru/posts/news/eco-world code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Eco-world - url: /en/new/posts/news/eco-world + url: /en/posts/news/eco-world tm: title: Ekodünýä - url: /tm/new/posts/news/ekodunya + url: /tm/posts/news/ekodunya isHidden: '0' cssClass: '' isExternal: '0' - title: Технологии - nesting: null type: url - url: /ru/new/posts/news/technology + url: /ru/posts/news/technology code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Technology - url: /en/new/posts/news/technology + url: /en/posts/news/technology tm: title: Tehnologiýalar - url: /tm/new/posts/news/tehnologiyalar + url: /tm/posts/news/tehnologiyalar isHidden: '0' cssClass: '' isExternal: '0' - title: 'Новости партнеров' - nesting: null type: url - url: /ru/new/posts/news/novosti-partnerov + url: /ru/posts/news/novosti-partnerov code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: 'Media partners news' - url: /en/new/posts/news/media-partners-news + url: /en/posts/news/media-partners-news tm: title: 'Hyzmatdaşlarymyzyň habarlary' - url: /tm/new/posts/news/hyzmatdaslarymyzyn-habarlary + url: /tm/posts/news/hyzmatdaslarymyzyn-habarlary isHidden: '0' cssClass: '' isExternal: '0' - title: Статьи - nesting: null type: url - url: /ru/new/posts/stati + url: /ru/posts/stati code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Articles - url: /en/new/posts/stati + url: /en/posts/stati tm: title: Makalalar - url: /tm/new/posts/stati + url: /tm/posts/stati isHidden: '0' cssClass: '' isExternal: '0' items: - title: События - nesting: null type: url - url: /ru/new/posts/stati/events + url: /ru/posts/stati/events code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Events - url: /en/new/posts/stati/events + url: /en/posts/stati/events tm: title: Wakalar - url: /tm/new/posts/stati/chareler + url: /tm/posts/stati/chareler isHidden: '0' cssClass: '' isExternal: '0' - title: Экономика - nesting: null type: url - url: /ru/new/posts/stati/economy + url: /ru/posts/stati/economy code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Economy - url: /en/new/posts/stati/economy + url: /en/posts/stati/economy tm: title: Ykdysadyýet - url: /tm/new/posts/stati/ykdysadyyet + url: /tm/posts/stati/ykdysadyyet isHidden: '0' cssClass: '' isExternal: '0' - title: Общество - nesting: null type: url - url: /ru/new/posts/stati/society + url: /ru/posts/stati/society code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Society - url: /en/new/posts/stati/society + url: /en/posts/stati/society tm: title: Jemgyýet - url: /tm/new/posts/stati/jemgyyet + url: /tm/posts/stati/jemgyyet isHidden: '0' cssClass: '' isExternal: '0' - title: 'От редактора' - nesting: null type: url - url: /ru/new/posts/stati/ot-redaktora + url: /ru/posts/stati/ot-redaktora code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: 'Editor''s choice' - url: /en/new/posts/stati/editors-choice + url: /en/posts/stati/editors-choice tm: title: 'Redaktoryň pikiri' - url: /tm/new/posts/stati/redaktoryn-pikiri + url: /tm/posts/stati/redaktoryn-pikiri isHidden: '0' cssClass: '' isExternal: '0' - title: Культура - nesting: null type: url - url: /ru/new/posts/stati/culture + url: /ru/posts/stati/culture code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Culture - url: /en/new/posts/stati/culture + url: /en/posts/stati/culture tm: title: Medeniýet - url: /tm/new/posts/stati/medeniyet + url: /tm/posts/stati/medeniyet isHidden: '0' cssClass: '' isExternal: '0' - title: Полезное - nesting: null type: url - url: /ru/new/posts/stati/poleznoe + url: /ru/posts/stati/poleznoe code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: 'Useful articles' - url: '/En/new/posts/stati/Useful articles' + url: '/en/posts/stati/Useful articles' tm: title: 'Peýdaly makalalar' - url: /tm/new/posts/stati/peydaly-makalalar + url: /tm/posts/stati/peydaly-makalalar isHidden: '0' cssClass: '' isExternal: '0' - title: Спорт - nesting: null type: url - url: /ru/new/posts/stati/sport + url: /ru/posts/stati/sport code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Sport - url: /en/new/posts/stati/sport + url: /en/posts/stati/sport tm: title: Sport - url: /tm/new/posts/stati/sport + url: /tm/posts/stati/sport isHidden: '0' cssClass: '' isExternal: '0' - title: Экомир - nesting: null type: url - url: /ru/new/posts/stati/eco-world + url: /ru/posts/stati/eco-world code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Eco-world - url: /en/new/posts/stati/eco-world + url: /en/posts/stati/eco-world tm: title: Eco-world - url: /tm/new/posts/stati/ekodunya + url: /tm/posts/stati/ekodunya isHidden: '0' cssClass: '' isExternal: '0' - title: Технологии - nesting: null type: url - url: /ru/new/posts/stati/technology + url: /ru/posts/stati/technology code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Technology - url: /en/new/posts/stati/technology + url: /en/posts/stati/technology tm: title: Tehnologiýalar - url: /tm/new/posts/stati/tehnologiyalar + url: /tm/posts/stati/tehnologiyalar isHidden: '0' cssClass: '' isExternal: '0' - title: Медиа - nesting: null type: url - url: /ru/new/posts/media + url: /ru/posts/media code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Media - url: /en/new/posts/media + url: /en/posts/media tm: title: Media - url: /tm/new/posts/media + url: /tm/posts/media isHidden: '0' cssClass: '' isExternal: '0' @@ -426,7 +358,7 @@ items: title: Фото nesting: null type: url - url: /ru/new/posts/media/photo + url: /ru/posts/media/photo code: '' reference: null cmsPage: null @@ -446,7 +378,7 @@ items: title: Видео nesting: null type: url - url: /ru/new/posts/media/video + url: /ru/posts/media/video code: '' reference: null cmsPage: null @@ -464,142 +396,114 @@ items: isExternal: '0' - title: Афиша - nesting: null type: url - url: /ru/new/posts/poster + url: /ru/posts/poster code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Posters - url: /en/new/posts/poster + url: /en/posts/poster tm: title: Afişa - url: /tm/new/posts/poster + url: /tm/posts/poster isHidden: '0' cssClass: '' isExternal: '0' items: - title: Концерты - nesting: null type: url - url: /ru/new/posts/poster/koncerty + url: /ru/posts/poster/koncerty code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Concerts - url: /en/new/posts/poster/concerts + url: /en/posts/poster/concerts tm: title: Konsertler - url: /tm/new/posts/poster/konsertler + url: /tm/posts/poster/konsertler isHidden: '0' cssClass: '' isExternal: '0' - title: Кинотеатры - nesting: null type: url - url: /ru/new/posts/poster/kinoteatry + url: /ru/posts/poster/kinoteatry code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Cinemas - url: /en/new/posts/poster/cinemas + url: /en/posts/poster/cinemas tm: title: Kinoteatrlar - url: /tm/new/posts/poster/kinolar + url: /tm/posts/poster/kinolar isHidden: '0' cssClass: '' isExternal: '0' - title: Театры - nesting: null type: url - url: /ru/new/posts/poster/teatry + url: /ru/posts/poster/teatry code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Theaters - url: /en/new/posts/poster/theaters + url: /en/posts/poster/theaters tm: title: Teatrlar - url: /tm/new/posts/poster/teatrlar + url: /tm/posts/poster/teatrlar isHidden: '0' cssClass: '' isExternal: '0' - title: Выставки - nesting: null type: url - url: /ru/new/posts/poster/vystavki + url: /ru/posts/poster/vystavki code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Exhibitions - url: /en/new/posts/poster/exhibitions + url: /en/posts/poster/exhibitions tm: title: Sergiler - url: /tm/new/posts/poster/sergiler + url: /tm/posts/poster/sergiler isHidden: '0' cssClass: '' isExternal: '0' - title: Спорт - nesting: null type: url - url: /ru/new/posts/poster/sportt + url: /ru/posts/poster/sportt code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Sport - url: /en/new/posts/poster/sport + url: /en/posts/poster/sport tm: title: Sport - url: /tm/new/posts/poster/sport + url: /tm/posts/poster/sport isHidden: '0' cssClass: '' isExternal: '0' - title: Объявления - nesting: null type: url - url: /ru/new/posts/poster/obyavleniya + url: /ru/posts/poster/obyavleniya code: '' - reference: null - cmsPage: null - replace: null viewBag: locale: en: title: Аds - url: /en/new/posts/poster/ads + url: /en/posts/poster/ads tm: title: Bildirişler - url: /tm/new/posts/poster/mahabat + url: /tm/posts/poster/mahabat isHidden: '0' cssClass: '' isExternal: '0' @@ -629,7 +533,7 @@ items: type: cms-page url: null code: '' - reference: new/contact + reference: contact cmsPage: null replace: null viewBag: diff --git a/themes/modern2/pages/404.htm b/themes/modern2/pages/404.htm index 340a8e11e..517a02786 100644 --- a/themes/modern2/pages/404.htm +++ b/themes/modern2/pages/404.htm @@ -5,6 +5,28 @@ is_hidden = 0 robot_index = "index" robot_follow = "follow" == + +
+

' . __('Page Deleted') . '

+

' . __('We are sorry, but the page you are trying to access has been deleted.') . '

+ + Go Back to Home + +
+ '; + + // Add 'X-Robots-Tag' header to prevent indexing + return Response::make($html, 410) + ->header('X-Robots-Tag', 'noindex, nofollow'); +} +?> +==

{{'Page not found'|_}}

diff --git a/themes/modern2/pages/adstxt.htm b/themes/modern2/pages/adstxt.htm index 232dc9007..54aee8ec1 100644 --- a/themes/modern2/pages/adstxt.htm +++ b/themes/modern2/pages/adstxt.htm @@ -4,4 +4,5 @@ is_hidden = 0 robot_index = "index" robot_follow = "follow" == -google.com, pub-4375305456879458, DIRECT, f08c47fec0942fa0 \ No newline at end of file +google.com, pub-4375305456879458, DIRECT, f08c47fec0942fa0 +google.com, pub-9296898717630432, DIRECT, f08c47fec0942fa0 \ No newline at end of file diff --git a/themes/modern2/pages/home2.htm b/themes/modern2/pages/home2.htm deleted file mode 100644 index 0dd62a0c2..000000000 --- a/themes/modern2/pages/home2.htm +++ /dev/null @@ -1,152 +0,0 @@ -title = "home2" -url = "/home2" -layout = "master" -is_hidden = 0 -robot_index = "index" -robot_follow = "follow" - -[blogCategories] -slug = "{{ :slug }}" -displayEmpty = 0 -categoryPage = "category" - -[adverts adv_center_1] -code = "bank" -type = "slider" -random = 0 - -[adverts adv_center_2] -code = "bottom" -type = "slider" -random = 0 - -[adverts adv_center_3] -code = "cnpc" -type = "slider" -random = 0 - -[adverts adv_center_4] -code = "china-daily" -type = "slider" -random = 0 - -[adverts adv_center_5] -code = "very-bottom" -type = "slider" -random = 0 - -[adverts right_top] -code = "right-top" -type = "slider" -random = 0 - -[adverts right_middle] -code = "right-middle" -type = "slider" -random = 0 - -[adverts right_bottom] -code = "right-bottom" -type = "slider" -random = 0 - -[adverts right_top_m] -code = "right-top" -type = "slider" -random = 0 - -[adverts right_middle_m] -code = "right-middle" -type = "slider" -random = 0 - -[adverts right_bottom_m] -code = "right-bottom" -type = "slider" -random = 0 -== -
-
-
- {% partial 'slider' %} -
-
-
- - - -
-
-
-
-
- {% component 'adv_center_1' %} -
- - {% partial 'index/top_section' category = blogCategories.categories.shift %} - -
- {% component 'adv_center_2' %} -
-
-
- {% partial 'index/category_posts2' category = blogCategories.categories.shift %} - - {% partial 'index/category_posts2' category = blogCategories.categories.shift %} -
-
-
- {% component 'adv_center_3' %} -
-
-
- {% partial 'index/category_posts2' category = blogCategories.categories.shift %} - - {% partial 'index/category_posts2' category = blogCategories.categories.shift %} -
-
-
- {% component 'adv_center_4' %} -
-
-
- {% partial 'index/category_posts2' category = blogCategories.categories.shift %} - - {% partial 'index/category_posts2' category = blogCategories.categories.shift %} -
-
-
- {% component 'adv_center_5' %} -
- -
-
- {% partial 'sidebar__cards' %} - {% component 'right_top' css_class= 'main__sidebar-adv' %} - {% partial 'popular-posts2' %} - {% component 'right_middle' css_class = 'main__sidebar-adv' %} - {% component 'right_bottom' css_class= 'main__sidebar-adv' %} - {% component 'right_top' css_class= 'main__sidebar-adv' %} - {% partial 'tags' %} - {% partial 'calendar' %} -
-
-
-
- -

{{ blogCategories.categories.shift.name }}

- -{% partial 'index/mobile_app' %} - - - \ No newline at end of file diff --git a/themes/modern2/pages/index.htm b/themes/modern2/pages/index.htm deleted file mode 100644 index fac2e7e6a..000000000 --- a/themes/modern2/pages/index.htm +++ /dev/null @@ -1,157 +0,0 @@ -title = "Главная" -url = "/qoldqq" -layout = "master" -meta_title = "Новости Туркменистана и мира" -meta_description = "Мы информируем о событиях, происшествиях и тенденциях, которые влияют на жизнь Туркменистана и всего Центрально-Азиатского региона. Ежедневно контент пополняется свежими и достоверными новостями." -is_hidden = 0 -seo_keywords = "Новости Туркменистана, новости мира, последние новости, актуальные новости, президент, Гурбангулы Бердымухаммедов, События, Общество, Экономика, Культура, Экомир, Спорт. Технологии, независимое, информационное агентство, информагентство Туркменистана, страны, интересные новости, фото, видео, объявления, в Ашхабаде, в Туркменистане." -robot_index = "index" -robot_follow = "follow" - -[viewBag] -localeTitle[en] = "Home" -localeMeta_title[en] = "All main news of Turkmenistan today. Latest news of the region." -localeMeta_title[tm] = "Türkmenistanyň we dünýä habarlary" -localeMeta_description[en] = "Events. The main and latest news of politics for today. Latest political news of Turkmenistan" - -[blogCategories] -slug = "{{ :slug }}" -displayEmpty = 0 -categoryPage = "category" - -[adverts adv_center_1] -code = "bank" -type = "slider" -random = 0 - -[adverts adv_center_2] -code = "bottom" -type = "slider" -random = 0 - -[adverts adv_center_3] -code = "cnpc" -type = "slider" -random = 0 - -[adverts adv_center_4] -code = "china-daily" -type = "slider" -random = 0 - -[adverts adv_center_5] -code = "very-bottom" -type = "slider" -random = 0 - -[adverts right_top] -code = "right-top" -type = "slider" -random = 0 - -[adverts right_middle] -code = "right-middle" -type = "slider" -random = 0 - -[adverts right_bottom] -code = "right-bottom" -type = "slider" -random = 0 - -[adverts right_top_m] -code = "right-top" -type = "slider" -random = 0 - -[adverts right_middle_m] -code = "right-middle" -type = "slider" -random = 0 - -[adverts right_bottom_m] -code = "right-bottom" -type = "slider" -random = 0 -== -
-
-
- {% partial 'slider' %} -
-
-
- - -
-
-
-
-
- {% component 'adv_center_1' %} -
- - {% partial 'index/top_section' category = blogCategories.categories.shift %} - -
- {% component 'adv_center_2' %} -
-
-
- {% partial 'index/category_posts' category = blogCategories.categories.shift %} - - {% partial 'index/category_posts' category = blogCategories.categories.shift %} -
-
-
- {% component 'adv_center_3' %} -
-
-
- {% partial 'index/category_posts' category = blogCategories.categories.shift %} - - {% partial 'index/category_posts' category = blogCategories.categories.shift %} -
-
-
- {% component 'adv_center_4' %} -
-
-
- {% partial 'index/category_posts' category = blogCategories.categories.shift %} - - {% partial 'index/category_posts' category = blogCategories.categories.shift %} -
-
-
- {% component 'adv_center_5' %} -
- -
-
- {% partial 'sidebar__cards' %} - {% component 'right_top' css_class= 'main__sidebar-adv' %} - {% partial 'popular-posts' %} - {% component 'right_middle' css_class = 'main__sidebar-adv' %} - {% component 'right_bottom' css_class= 'main__sidebar-adv' %} - {% partial 'tags' %} - {% partial 'calendar' %} -
-
-
-
- -{% partial 'index/mobile_app' %} - - - \ No newline at end of file diff --git a/themes/modern2/pages/new/contact.htm b/themes/modern2/pages/new/contact.htm index 7115667a5..32a739816 100644 --- a/themes/modern2/pages/new/contact.htm +++ b/themes/modern2/pages/new/contact.htm @@ -2,49 +2,417 @@ title = "new/contact" url = "/new/contact" layout = "new/master-inside" meta_title = "Обратная связь" -is_hidden = 0 +is_hidden = 1 robot_index = "index" robot_follow = "follow" [contactForm] == + +
-
-
+
+
+ +
+

Контакты

+
+
+
- - -
-
- - +
+

Свяжитесь с нами

+

Есть идея или сообщение для нашего агентства? Заполните форму ниже, и мы обязательно с вами свяжемся. Ваши предложения и вопросы помогают нам становиться лучше!

+
+
+
+ + +
+
+ + +
- - -
-
- - -
-
- -
-
- - + +
- -
+ +
+
+

Контактные данные Orient

+

+ Наши контактные данные, адрес офиса и режим работы. Мы всегда на + связи, чтобы ответить на ваши вопросы и предложения. Ждем вас! +

+
+ +
+ +
+

Офис расположен по адресу:

+
+ + + +
+

{{ this.theme.officeIsLocated }}

+
+
+
+ +
+

Режим работы:

+
+ + + + +
+

{{ this.theme.workingHours }}

+
+
+
+ +
+ +
+ +
+

Контакты редакции:

+
+ + + + +
+

Email редакции:

+ +

{{ this.theme.editorialEmail }}

+
+
+ +
+ + + + + +
+

Телефон редакции:

+ +

{{ this.theme.editorialPhone }}

+
+
+
+ +
+

Контакты администрации:

+
+ + + + +
+

Email администрации:

+ +

{{ this.theme.emailTheAdministration }}

+
+
+ +
+ + + + + +
+

Телефон администрации:

+ +

{{ this.theme.administrationPhone }}

+
+
+
+ +
+ +
-
\ No newline at end of file +
+ + +{% put scripts %} + + +{% endput %} \ No newline at end of file diff --git a/themes/modern2/pages/new/group.htm b/themes/modern2/pages/new/group.htm index a81c36093..f33bd9cc2 100644 --- a/themes/modern2/pages/new/group.htm +++ b/themes/modern2/pages/new/group.htm @@ -1,5 +1,5 @@ title = "Рубрика" -url = "/new/posts/:categoryGroup/:slug?" +url = "/posts/:categoryGroup/:slug?" layout = "new/master-inside" is_hidden = 0 robot_index = "index" @@ -19,6 +19,8 @@ categoryPage = "new/category" postPage = "new/newPost" [mediaView] + +[expertForm] == page->meta_title = $this['groupName']->name; + //$this->page->meta_title = $this['groupName']->name; + if ($this['groupName']) { + $this->page->meta_title = $this['groupName']->name; + } else { + // Handle the case where the group is not found + $this->page->meta_title = 'Unknown Group'; + } }elseif(!$this['categorySlug'] && $this['group'] == 'media'){ $this->page->meta_title = 'Media'; } @@ -95,6 +103,59 @@ function onStart(){ {% set detailsPage = media.detailsPage %} {% set detailsKeyColumn = media.detailsKeyColumn %} {% set detailsUrlParameter = media.detailsUrlParameter %} +{% put styles %} + + +{% endput %} @@ -106,6 +167,27 @@ function onStart(){

{% if category.name != "" %}{{category.name}}{% else %} {% if group == 'media' %} {{ group }} {% else %}{{ groupName.name }}{% endif %} {% endif %}

+ + {% if category.id == 813 %} + +
+

{{'Добро пожаловать в раздел "В помощь экспортерам"!'|_}}

+

{{'Здесь вы можете бесплатно задать вопрос эксперту консалтинговой компании “Export Hyzmat” по экспортной деятельности и получить на него ответ в течение 24 часов.'|_}}

+

{{'Для этого необходимо заполнить контактную форму, нажав на кнопку «Вопрос эксперту».'|_}}

+

{{'Вы также можете просмотреть "Часто задаваемые вопросы" ниже. Возможно, среди них уже есть ответ на ваш вопрос.'|_}}

+
+
+ + faq icon + {{'Часто задаваемые вопросы'|_}} + + +
+ + {% endif %} {% if group == 'media' %} @@ -165,10 +247,27 @@ function onStart(){ + +
+
+
+ + + +
+
+
+ {% put scripts %} - + + - {% endput %} + + + {% endput %} \ No newline at end of file diff --git a/themes/modern2/pages/new/home.htm b/themes/modern2/pages/new/home.htm index 51c1ef343..50e7a50d6 100644 --- a/themes/modern2/pages/new/home.htm +++ b/themes/modern2/pages/new/home.htm @@ -1,7 +1,7 @@ title = "Главная" url = "/" layout = "new/master" -meta_title = "Новости Туркменистана и мира" +meta_title = "orient.tm - Новости Туркменистана и мира" meta_description = "Мы информируем о событиях, происшествиях и тенденциях, которые влияют на жизнь Туркменистана и всего Центрально-Азиатского региона. Ежедневно контент пополняется свежими и достоверными новостями." is_hidden = 0 seo_keywords = "Новости Туркменистана, новости мира, последние новости, актуальные новости, президент, Гурбангулы Бердымухаммедов, События, Общество, Экономика, Культура, Экомир, Спорт. Технологии, независимое, информационное агентство, информагентство Туркменистана, страны, интересные новости, фото, видео, объявления, в Ашхабаде, в Туркменистане." @@ -11,7 +11,13 @@ robot_follow = "follow" [viewBag] localeTitle[en] = "Home" localeTitle[tm] = "Baş Sahypa" + +[expertForm] == +{% put styles %} + +{% endput %} + {% partial 'test/main' %} {% partial 'newHome/main-popular' %} @@ -103,10 +109,26 @@ localeTitle[tm] = "Baş Sahypa" {% partial 'scripts/getPartners' groupId='1' %} +
+
+
+ + + +
+
+
+ {% put scripts %} + - {% endput %} \ No newline at end of file + {% endput %} diff --git a/themes/modern2/pages/new/newPost.htm b/themes/modern2/pages/new/newPost.htm index 4cb8e8f79..3a71e11f2 100644 --- a/themes/modern2/pages/new/newPost.htm +++ b/themes/modern2/pages/new/newPost.htm @@ -21,36 +21,65 @@ categoryPage = 404 post = "post" == page->blogPost); +//function onStart(){ +// //dd($this->page->blogPost); - $postId = $this->param('id'); - $currentPost = RainLab\Blog\Models\Post::where('id', $postId)->with(['category_groups'])->first(); - $this['featuredPosts'] = RainLab\Blog\Models\Post::with(['categories'])->where('id', $postId)->paginate(10); - $catId = $this['featuredPosts'][0]->categories[0]->id; - //dd($this['featuredPosts'][0]->categories[0]->slug); +// $postId = $this->param('id'); +// $currentPost = RainLab\Blog\Models\Post::where('id', $postId)->with(['category_groups'])->first(); +// $this['featuredPosts'] = RainLab\Blog\Models\Post::with(['categories'])->where('id', $postId)->paginate(10); +// $catId = $this['featuredPosts'][0]->categories[0]->id; +// //dd($this['featuredPosts'][0]->categories[0]->slug); - if($this->menuItems && $postId && $currentPost && $currentPost->category_groups->count() > 0){ +// if($this->menuItems && $postId && $currentPost && $currentPost->category_groups->count() > 0){ - $currentGroup = $currentPost->category_groups[0]->name; +// $currentGroup = $currentPost->category_groups[0]->name; - foreach ($this->menuItems as $menu){ - //dump($menu->title); +// foreach ($this->menuItems as $menu){ +// //dump($menu->title); - if($menu->title === $currentGroup){ - $menu->isActive = true; - break; - } +// if($menu->title === $currentGroup){ +// $menu->isActive = true; +// break; +// } - } - } +// } +// } - // dd($this['posts']); +// // dd($this['posts']); +//} +function onStart() { + $postId = $this->param('id'); + $currentPost = RainLab\Blog\Models\Post::where('id', $postId)->with(['category_groups'])->first(); + + + if ($currentPost && $currentPost->category_groups->count() > 0) { + + $this['featuredPosts'] = RainLab\Blog\Models\Post::with(['categories']) + ->where('id', $postId) + ->paginate(10); + + + if ($this['featuredPosts']->count() > 0 && $this['featuredPosts'][0]->categories->count() > 0) { + $catId = $this['featuredPosts'][0]->categories[0]->id; + + + if ($this->menuItems) { + $currentGroup = $currentPost->category_groups[0]->name; + + foreach ($this->menuItems as $menu) { + if ($menu->title === $currentGroup) { + $menu->isActive = true; + break; + } + } + } + } + } } ?> == diff --git a/themes/modern2/pages/oldpost.htm b/themes/modern2/pages/oldpost.htm deleted file mode 100644 index b0a4d8d2c..000000000 --- a/themes/modern2/pages/oldpost.htm +++ /dev/null @@ -1,96 +0,0 @@ -title = "oldPost" -url = "/ru/:slug" -layout = "blog" -is_hidden = 0 -robot_index = "index" -robot_follow = "follow" - -[viewBag] -localeUrl[en] = "en/:slug" - -[blogPost] -slug = "{{ :slug }}" -id = "{{ :id }}" -categoryPage = "blog/category" - -[views] -slug = "{{ :slug }}" - -[SeoBlogPost] -post = "post" -== -{% component 'SeoBlogPost' %} -
-
-
- -
- - - - - - - {% partial 'view' %} -
-
-

- {{post.title}} -

- {% if post.featured_image %} - - {{post.title}} - - {% endif %} -
-
- {{post.content|md}} -
- -
-
- {% partial 'latest_news'%} -
- -{% put scripts %} - -{% endput %} diff --git a/themes/modern2/pages/post.htm b/themes/modern2/pages/post.htm deleted file mode 100644 index 802d2b936..000000000 --- a/themes/modern2/pages/post.htm +++ /dev/null @@ -1,168 +0,0 @@ -title = "Пост" -url = "/old/post/:id/:slug" -layout = "new/master-inside" -is_hidden = 0 -seo_keywords = "Türkmenistan, Turkmenistan, Туркменистан, Ориент новости, Orient news, Orienttm, Turkmen habarlary, Turkmen habarlar, Turkmen news, Новости Туркменистана, Новости СНГ, Новости средней азии, Новости Центральной Азии," -robot_index = "index" -robot_follow = "follow" - -[viewBag] -localeTitle[en] = "Post" - -[blogPost] -slug = "{{ :slug }}" -id = "{{ :id }}" -categoryPage = 404 - -[views] -slug = "{{ :slug }}" - -[SeoBlogPost] -post = "post" -== -page->blogPost); - - $postId = $this->param('id'); - $currentPost = RainLab\Blog\Models\Post::where('id', $postId)->with(['category_groups'])->first(); - $this['featuredPosts'] = RainLab\Blog\Models\Post::with(['categories'])->where('id', $postId)->paginate(10); - $catId = $this['featuredPosts'][0]->categories[0]->id; - //dd($this['featuredPosts'][0]->categories[0]->slug); - - if($this->menuItems && $postId && $currentPost && $currentPost->category_groups->count() > 0){ - - - $currentGroup = $currentPost->category_groups[0]->name; - - foreach ($this->menuItems as $menu){ - //dump($menu->title); - - if($menu->title === $currentGroup){ - $menu->isActive = true; - break; - } - - } - } - - - - // dd($this['posts']); - - -} -?> -== -{% put styles %} - - - -{% endput %} -{% component 'SeoBlogPost' %} - - -{% set post = blogPost.post %} - -
-
-
-
-
-
-

- {{post.title}} -

- {{post.published_at|date('d.m.Y')}} | {{post.published_at|date('H:i')}} |
{% partial 'view' %}
-
-
-
-
- - {% if post.more_photo|length > 0 %} - - {% for img in post.more_photo %} - -
-
-  {{post.title}} -
-
- - {% endfor %} - - {% else %} -
-
-  {{post.title}} -
-
- {% endif %} - -
-
- -
-
- -
-
-
-
- {{post.content|md}} - - - - {% if post.img_source %} -
{{ 'Фото'|_ }}: {{ post.img_source }}
- {% endif %} -
- - {% partial 'new/social' %} - -
- - - {% partial 'new/post-featured' %} - -
- {% partial 'newHome/right-sidebar.htm' class="article-aside" %} -
-
-
- - {% put scripts %} - - - - - {% endput %} \ No newline at end of file diff --git a/themes/modern2/pages/rss.htm b/themes/modern2/pages/rss.htm index 36332ce6f..db070d767 100644 --- a/themes/modern2/pages/rss.htm +++ b/themes/modern2/pages/rss.htm @@ -17,8 +17,8 @@ localeMeta_description[en] = "The main and latest news of politics of Turkmenist categoryFilter = "{{ :category }}" sortOrder = "published_at desc" postsPerPage = 20 -blogPage = "index" -postPage = "post" +blogPage = 404 +postPage = 404 source = "yandex" exceptCategories = "obyavlenie,tendery" -== +== \ No newline at end of file diff --git a/themes/modern2/pages/test/home2-new.htm b/themes/modern2/pages/test/home2-new.htm deleted file mode 100644 index 30832a809..000000000 --- a/themes/modern2/pages/test/home2-new.htm +++ /dev/null @@ -1,85 +0,0 @@ -title = "test/home2-new" -url = "/home2-new" -layout = "test/test-master" -is_hidden = 0 -robot_index = "index" -robot_follow = "follow" -== -{% partial 'test/main3' %} -{% partial 'newHome/main-popular' %} - -{% partial 'adv/2adv' adv1Id="19" adv2Id="20" %} - -{% partial 'newHome/publication' %} - - -{% partial 'adv/2adv' adv1Id="21" adv2Id="22" %} - -{% partial 'newHome/poleznoe' %} - -
-
-
-
- {% partial 'test/video' %} -
- -
- {% partial 'newHome/photo' %} -
- - -
-
-
- - -
-
-
-

{{'media_partners'|_}}

-
-
-
- - {% partial 'newHome/partners' header="" %} - -
-
- -
-
- -
-
-
-
-
-
- - -
-
-
-
- -
-
- -
-
- -
-
-
- -
-
-
- - - {% put scripts %} - - - - {% endput %} \ No newline at end of file diff --git a/themes/modern2/partials/new/head.htm b/themes/modern2/partials/new/head.htm index 08c9d884c..404581e0f 100644 --- a/themes/modern2/partials/new/head.htm +++ b/themes/modern2/partials/new/head.htm @@ -15,4 +15,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/themes/modern2/partials/new/latest-news-mobile.htm b/themes/modern2/partials/new/latest-news-mobile.htm index 3a7686bea..f175301e0 100644 --- a/themes/modern2/partials/new/latest-news-mobile.htm +++ b/themes/modern2/partials/new/latest-news-mobile.htm @@ -8,9 +8,7 @@ noPostsMessage = "No posts found" sortOrder = "created_at desc" categoryPage = 404 postPage = 404 - == - {% set posts = blogPosts.posts %} @@ -35,7 +33,7 @@ postPage = 404 {% endfor %}
  • - {{'new.read.more'|_}} + {{'new.read.more'|_}}
  • - + \ No newline at end of file diff --git a/themes/modern2/partials/new/pagination.htm b/themes/modern2/partials/new/pagination.htm index cf4d51d66..33840a811 100644 --- a/themes/modern2/partials/new/pagination.htm +++ b/themes/modern2/partials/new/pagination.htm @@ -1,5 +1,16 @@ [viewBag] == +{% put styles %} + +{% endput %} + {% if items.total > items.perPage %}
    @@ -13,10 +24,10 @@ -
    +