#53 - base template clean-up

inc/js/jquery.anim.js

@@ -4,9 +4,6 @@
  * @license     CC-BY - http://creativecommons.org/licenses/by/3.0/
  */
 
-// TODO: make sure that there is no duplicate code in bx_loading functions
-// TODO: name it with jquery. prefix since it is jquery plugin
-
 $.fn.bx_anim = function(action, effect, speed, h) {
    return this.each(function() {
            var sFunc = '';
@@ -53,55 +50,24 @@ $.fn.bx_anim = function(action, effect, speed, h) {
           return this;
    });
 };
-$.fn.bx_loading = function(sParentSelector) {
-    var iWidth = 0, iHeight =0;
-    var oParent = null, oOffset = null;
-
-    if(sParentSelector != undefined)
-        oParent = $(sParentSelector);
-
-    return this.each(function() {
-        var oLoading = $(this);
-        var oLoadingIcon = oLoading.children('.sys-loading-icon');
-
-        oParent = oParent != null ? oParent : oLoading.parent();
-
-        if(!oLoading.is(':visible')) {
-            oOffset = oParent.offset();
-            iWidth = oParent.outerWidth();
-            iHeight = oParent.outerHeight();
 
-            /*--- Set Main ---*/
-            oLoading.width(iWidth);
-            oLoading.height(iHeight);
+$.fn.bx_loading = function(bForceIndicator) {
+    return $.fn._bx_loading('.bx-loading-ajax', bForceIndicator);
+};
 
-            /*--- Set Icon ---*/
-            oLoadingIcon.css('left', (iWidth - parseInt(oLoadingIcon.css('width')))/2);
-            oLoadingIcon.css('top', (iHeight - parseInt(oLoadingIcon.css('height')))/2);
-            oLoading.show();
-        }
-        else
-            oLoading.hide();
-    });
+$.fn.bx_loading_btn = function(bForceIndicator) {
+    return $.fn._bx_loading('.bx-loading-ajax-btn', bForceIndicator);
 };
-$.fn.bx_btn_loading = function(sParentSelector) {
-	var sAttr = 'bx-loading-id';
-	var oDate = new Date();
-    return this.each(function() {
-        var oObject = $(this);
-        if(!oObject.hasClass('bx-btn'))
-        	return;
 
-        if(oObject.is(':visible')) {
-        	var oClone = oObject.attr(sAttr, oDate.getTime()).clone().attr('disabled', 'disabled').addClass('bx-btn-loading').html(aDolLang['_sys_txt_btn_loading']);
-        	oObject.hide().after(oClone);
-        }
-        else {
-        	var iId = oObject.attr(sAttr);
-        	oObject.removeAttr(sAttr).show().siblings("[" + sAttr + "='" + iId + "']").remove();
-        }
+$.fn._bx_loading = function(sLoadingSelector, bForceIndicator) {
+    return this.each(function() {
+        var oContainer = $(this);
+        var oLoading = oContainer.find(sLoadingSelector);
+        bForceIndicator = 'undefined' == typeof(bForceIndicator) ? oLoading.length && oLoading.is(':visible') : bForceIndicator;
+        bx_loading_btn(oContainer, bForceIndicator);
     });
 };
+
 $.fn.bx_message_box = function(sMessage, iTimer, onClose) {
     return this.each(function() {
         var oParent = $(this);

samples/BxGridMy.php

@@ -289,7 +289,7 @@ class BxGridMy extends BxTemplGrid {
      */
     protected function _getCellHeaderStatus ($sKey, $aField) { 
         $s = parent::_getCellHeaderDefault($sKey, $aField);
-        return preg_replace ('/<th(.*?)>(.*?)<\/th>/', '<th$1><img src="' . BxDolTemplate::getInstance()->getIconUrl('cmt-female.gif') . '"></th>', $s);
+        return preg_replace ('/<th(.*?)>(.*?)<\/th>/', '<th$1><img src="' . BxDolTemplate::getInstance()->getIconUrl('sys_fl_kg.gif') . '"></th>', $s);
     }
 
     /**

template/css/calendar.css

@@ -1,55 +0,0 @@
-.sys_cal_wrapper > .dbBottomMenu { /* TODO: maybe dbBottomMenu is not needed in new design */
-    margin:0;
-}
-
-.sys_cal_table {
-    collapse-border:collapse;
-    width:100%;
-    border-spacing:10px;
-    font-size:11px;
-}
-
-.sys_cal_table th {
-    background-color:#FFF;
-    padding:0px;
-    text-align:center;
-}
-
-.sys_cal_cell_blank {
-    background-color:#F9FBFF;
-    border:1px solid #efefef;
-}
-
-.sys_cal_cell {
-    background-color:#F4F7FA;
-    text-align:center;
-    border:1px solid #dadada;
-    height:71px;
-    width:14.285%;
-}
-
-.sys_cal_today {
-    background-color:#fff;
-}
-
-.sys_cal_cell > u {
-    display:block;
-    font-size:11px;
-    text-decoration:none;
-    text-align:right;
-    margin:0px 3px 14px 0px;
-}
-
-.sys_cal_today > u {
-    font-weight:bold;
-}
-
-.sys_cal_cell > a {
-    font-size:11px;
-    text-transform:none;
-    text-align:center;
-}
-
-.sys_cal_cell > a > b {
-    font-size:18px;
-}

template/css/entry_view.css

@@ -1,179 +0,0 @@
-/* TODO: remake according to new design */
-
-/* info block */
-
-.bx_sys_block_info {
-    margin:5px;
-}
-
-.bx_sys_block_info .memberPic {
-    width:70px;
-    overflow:hidden;
-}
-
-.bx_sys_block_info .infoUnit {
-    width:155px;
-    overflow:hidden;
-}
-
-/* images block */
-
-.bx_sys_block_images_title_curr {
-    margin:10px auto;
-    width:604px;
-    font-size:12px;
-    text-align:center;
-    font-weight:bold;
-}
-
-.bx_sys_block_images_curr {
-    border:1px solid #ccc;
-    margin:0 auto;
-    width:604px;
-    text-align:center;
-}
-
-.bx_sys_block_images_curr > img {
-    margin:2px;
-}
-
-.bx_sys_block_images_icons {
-    margin:6px 10px;
-}
-
-.bx_sys_block_images_icons > .sys_icon {
-    float:left;
-    margin:2px;
-}
-
-.bx_sys_block_images_icons > .sys_icon > img {
-    cursor:hand;
-    cursor:pointer;
-}
-
-
-/* videos block */
-
-.bx_sys_block_videos_title_curr {
-    margin:10px;
-    font-size:12px;
-    text-align:center;
-    font-weight:bold;
-}
-
-.bx_sys_block_videos_curr {
-    margin:0 10px;
-    height:400px;
-    position:relative;
-}
-
-.bx_sys_block_videos_curr > div {
-    position:absolute;
-    top:0;
-    left:0;
-    width:100%;
-    height:400px;
-}
-.bx_sys_block_videos_curr div.viewFile {
-    margin: 0px auto;
-    padding: 0px;
-    border: 0px;
-}
-
-.bx_sys_block_videos_icons {
-    margin:6px 10px;
-}
-
-.bx_sys_block_videos_icons > .sys_icon {
-    float:left;
-    margin:2px;
-    width:auto;
-}
-
-.bx_sys_block_videos_icons > .sys_icon > img {
-    cursor:hand;
-    cursor:pointer;
-    height:32px;
-}
-
-/* sounds block */
-
-.bx_sys_block_sounds_title_curr {
-    margin:10px;
-    font-size:12px;
-    text-align:center;
-    font-weight:bold;
-}
-
-.bx_sys_block_sounds_curr {
-    margin:0 10px;
-    height:350px;
-    position:relative;
-}
-
-.bx_sys_block_sounds_curr > div {
-    position:absolute;
-    top:0;
-    left:0;
-    width:100%;
-    height:350px;
-}
-
-.bx_sys_block_sounds_icons {
-    margin:6px 10px;
-}
-
-.bx_sys_block_sounds_icons > .sys_icon {
-    float:left;
-    margin:2px;
-    width:auto;
-}
-
-.bx_sys_block_sounds_icons > .sys_icon > img {
-    cursor:hand;
-    cursor:pointer;
-    height:32px;
-}
-
-/* files block */
-.bx_sys_files_wrapper {
-    margin:10px 5px 0px 5px;
-}
-
-.bx_sys_files_line {
-    margin:0px 5px 10px 5px;
-    background-color:#f4f7fa;
-    position:relative;
-    padding:0 0 0 48px;
-    min-height:48px;
-}
-
-.bx_sys_files_line .sys_icon {
-    position:absolute;
-    top:5px;
-    left:5px;
-}
-
-.bx_sys_files_line p {
-    display:block;
-    font-size:12px;
-    font-weight:bold;
-    padding:5px 75px 0 0;
-}
-
-.bx_sys_files_line u {
-    font-size:9px;
-    text-decoration:none;
-    font-style:normal;
-    text-transform:lowercase;
-}
-
-.bx_sys_files_line .button_wrapper {
-    float:right;
-    margin-left:5px;
-}
-
-.bx_sys_files_line .bx_sys_files_btns {
-    padding:5px 5px 5px 0;
-}
-

template/images/icons/index.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>.:&nbsp;:.</title>
-</head>
-<body>
-    &nbsp;
-</body>
-</html>

template/images/todo.txt

@@ -1,2 +0,0 @@
-loading.gif spacer.gif are ok
-TODO: all other files need to be deleted/replaces according to new design

template/loading.html

@@ -1,7 +0,0 @@
-<!-- TODO: remake according to new design and styles, also check if ot can be removed since there are js function to show loading, or make usre taht the same styles are used at least  -->
-<div class="sys-loading" id="__name__">
-    <div class="sys-loading-smog"></div>
-    <div class="sys-loading-icon" style="background-image:url(<bx_image_url:loading_bg.png />)">
-        <img src="<bx_image_url:loading.gif />" />
-    </div>
-</div>

template/menu_main.html

@@ -1,3 +1,3 @@
 <ul id="bx-menu-main" class="bx-menu-main bx-menu-object-__object__ bx-clearfix">
-    <li class="bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover"><!-- TODO: maybe will be used later <i class="sys-icon __icon__ bx-def-margin-sec-right"></i> --><a href="__link__">__title__</a></li>
+    <li class="bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover"><a href="__link__">__title__</a></li>
 </ul>

template/scripts/BxBaseFunctions.php

@@ -68,13 +68,6 @@ class BxBaseFunctions extends BxDol implements iBxDolSingleton
         ));
     }
 
-    function loadingBox($sName) 
-    {
-        return $this->_oTemplate->parseHtmlByName('loading.html', array(
-            'name' => $sName,
-        ));
-    }
-
     /**
      * Get standard popup box with title.
      *
@@ -388,7 +381,7 @@ class BxBaseFunctions extends BxDol implements iBxDolSingleton
 	        $oTranscoder = BxDolImageTranscoder::getObjectInstance(BX_DOL_TRANSCODER_OBJ_ICON_FACEBOOK);
 	        $sImageUrlFcb = $oTranscoder->getImageUrl($iId);
 
-	        //apple touch icon
+	        // apple touch icon
 	        $oTranscoder = BxDolImageTranscoder::getObjectInstance(BX_DOL_TRANSCODER_OBJ_ICON_APPLE);
 	        $sImageUrlApl = $oTranscoder->getImageUrl($iId);
         }