diff --git a/application/helpers/dateformat_helper.php b/application/helpers/dateformat_helper.php index b403cb4c0..cc91ea323 100644 --- a/application/helpers/dateformat_helper.php +++ b/application/helpers/dateformat_helper.php @@ -42,6 +42,7 @@ function dateformat_jquery($php_format) 's' => 'ss', 'u' => '' ); + $jqueryui_format = ""; $escaping = false; for($i = 0; $i < strlen($php_format); $i++) @@ -66,4 +67,67 @@ function dateformat_jquery($php_format) return $jqueryui_format; } +function dateformat_bootstrap($php_format) +{ + $SYMBOLS_MATCHING = array( + // Day + 'd' => 'dd', + 'D' => 'd', + 'j' => 'd', + 'l' => 'dd', + 'N' => '', + 'S' => '', + 'w' => '', + 'z' => '', + // Week + 'W' => '', + // Month + 'F' => 'MM', + 'm' => 'mm', + 'M' => 'M', + 'n' => 'm', + 't' => '', + // Year + 'L' => '', + 'o' => '', + 'Y' => 'yyyy', + 'y' => 'yy', + // Time + 'a' => 'p', + 'A' => 'PP', + 'B' => '', + 'g' => 'H', + 'G' => 'h', + 'h' => 'HH', + 'H' => 'hh', + 'i' => 'ii', + 's' => 'ss', + 'u' => '' + ); + + $bootstrap_format = ""; + $escaping = false; + for($i = 0; $i < strlen($php_format); $i++) + { + $char = $php_format[$i]; + if($char === '\\') // PHP date format escaping character + { + $i++; + if($escaping) $bootstrap_format .= $php_format[$i]; + else $bootstrap_format .= '\'' . $php_format[$i]; + $escaping = true; + } + else + { + if($escaping) { $bootstrap_format .= "'"; $escaping = false; } + if(isset($SYMBOLS_MATCHING[$char])) + $bootstrap_format .= $SYMBOLS_MATCHING[$char]; + else + $bootstrap_format .= $char; + } + } + + return $bootstrap_format; +} + ?> \ No newline at end of file diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php index dab383109..6387e4559 100644 --- a/application/helpers/table_helper.php +++ b/application/helpers/table_helper.php @@ -157,7 +157,7 @@ function get_people_manage_table_data_rows($people,$controller) if($people->num_rows()==0) { - $table_data_rows.="
';
+ }
+ else
+ {
+ ele.style.display = "block";
+ imageEle.innerHTML = '
';
+ }
+}
+
function init_table_sorting()
{
//Only init if there is more than one row
@@ -127,26 +145,6 @@ function post_bulk_form_submit(response)
set_feedback(response.message, 'alert alert-dismissible alert-success', false);
}
}
-
-function show_hide_search_filter(search_filter_section, switchImgTag)
-{
- var ele = document.getElementById(search_filter_section);
- var imageEle = document.getElementById(switchImgTag);
- var elesearchstate = document.getElementById('search_section_state');
-
- if(ele.style.display == "block")
- {
- ele.style.display = "none";
- imageEle.innerHTML = '
';
- elesearchstate.value="none";
- }
- else
- {
- ele.style.display = "block";
- imageEle.innerHTML = '
';
- elesearchstate.value="block";
- }
-}
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 21e5039fb..194025d82 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -14,7 +14,6 @@
-
@@ -39,7 +38,7 @@
-
+
diff --git a/application/views/sales/manage.php b/application/views/sales/manage.php
index 5b93a3085..4ace42117 100755
--- a/application/views/sales/manage.php
+++ b/application/views/sales/manage.php
@@ -3,7 +3,6 @@
"),u=n("__ie_ondomload"),u&&p(u,"onreadystatechange",a)}catch(f){}N.webkit&&typeof C.readyState!=v&&(I=setInterval(function(){/loaded|complete/.test(C.readyState)&&b()},10)),typeof C.addEventListener!=v&&C.addEventListener("DOMContentLoaded",b,null),d(b)}}(),function(){N.ie&&N.win&&window.attachEvent("onunload",function(){for(var a=H.length,b=0;a>b;b++)H[b][0].detachEvent(H[b][1],H[b][2]);for(var c=G.length,d=0;c>d;d++)l(G[d]);for(var e in N)N[e]=null;N=null;for(var f in swfobject)swfobject[f]=null;swfobject=null})}()}return{registerObject:function(a,b,c){if(N.w3cdom&&a&&b){var d={};d.id=a,d.swfVersion=b,d.expressInstall=c?c:!1,F[F.length]=d,s(a,!1)}},getObjectById:function(a){var b=null;if(N.w3cdom){var c=n(a);if(c){var d=c.getElementsByTagName(w)[0];!d||d&&typeof c.SetVariable!=v?b=c:typeof d.SetVariable!=v&&(b=d)}}return b},embedSWF:function(a,b,d,e,f,h,i,k,l){if(N.w3cdom&&a&&b&&d&&e&&f)if(d+="",e+="",q(f)){s(b,!1);var m={};if(l&&typeof l===w)for(var n in l)l[n]!=Object.prototype[n]&&(m[n]=l[n]);m.data=a,m.width=d,m.height=e;var o={};if(k&&typeof k===w)for(var p in k)k[p]!=Object.prototype[p]&&(o[p]=k[p]);if(i&&typeof i===w)for(var r in i)i[r]!=Object.prototype[r]&&(typeof o.flashvars!=v?o.flashvars+="&"+r+"="+i[r]:o.flashvars=r+"="+i[r]);c(function(){j(m,o,b),m.id==b&&s(b,!0)})}else h&&!M&&q("6.0.65")&&(N.win||N.mac)&&(M=!0,s(b,!1),c(function(){var a={};a.id=a.altContentId=b,a.width=d,a.height=e,a.expressInstall=h,g(a)}))},getFlashPlayerVersion:function(){return{major:N.pv[0],minor:N.pv[1],release:N.pv[2]}},hasFlashPlayerVersion:q,createSWF:function(a,b,c){return N.w3cdom?j(a,b,c):void 0},removeSWF:function(a){N.w3cdom&&l(a)},createCSS:function(a,b){N.w3cdom&&r(a,b)},addDomLoadEvent:c,addLoadEvent:d,getQueryParamValue:function(a){var b=C.location.search||C.location.hash;if(null==a)return t(b);if(b)for(var c=b.substring(1).split("&"),d=0;d| ' + tmph + ' | '; - } - } - else { - for (var m = o[litem + 'Min']; m <= max[litem]; m += parseInt(o[litem + 'Grid'], 10)) { - gridSize[litem]++; - html += '' + ((m < 10) ? '0' : '') + m + ' | '; - } - } - - html += '