Changeset 15538 for trunk/templates

Timestamp:

10/03/11 22:04:38 (8 months ago)

Author:

Alexander Trofimov

Message:

Paginate + some design fixes in studio and message box

Location:

trunk/templates/base

Files:

• css/common.css (modified) (1 diff)
• css/paginate.css (modified) (1 diff)
• messageBox.html (modified) (1 diff)
• pageable_items.html (deleted)
• paginate.html (modified) (1 diff)
• paginate_pages.html (deleted)
• scripts/BxBasePaginate.php (modified) (1 diff)

trunk/templates/base/css/common.css

@@ -199 +199 @@
 .bx-msg-box-container {
     padding:0px 5px;
-}
-
-table.bx-msg-box {
-    border-collapse:collapse;
+    text-align:center;
 }
 
 .bx-msg-box {
+    display:inline-block; 
     margin-right:auto;
     margin-left:auto;

trunk/templates/base/css/paginate.css

@@ -2 +2 @@
 /* * * * Pagination * * * */
 
-div.paginate {
-    background-color:#EDEDED;
-    height:30px;
-    width:100%;
-
+.bx-paginate {
+    line-height:38px;
 }
-div.paginate div.info,
-div.paginate div.view_all,
-div.paginate div.reloader,
-div.paginate div.per_page {
-    float: left;
+.bx-paginate-simple {
+    line-height:22px;
 }
 
-div.paginate div.info {
-    height: 30px;
-    padding: 0px 5px 0px 10px;
-
-    line-height: 30px;
-    font-size: 11px;
-    font-weight: bold;
-    color: #333333;
+.bx-paginate .bx-btn {
+    font-size:24px; 
+    line-height:32px; /* 36 */
+    font-weight:bold;
 }
-div.paginate div.view_all {
-    height: 30px;
-    margin-left: 10px;
-    padding-left: 21px;
-    background-position: 0px center;
-    background-repeat: no-repeat;
-    line-height: 30px;
-}
-div.paginate div.view_all a {
-    font-weight: normal !important;
-}
-div.paginate div.view_all a:hover {
-    text-decoration: underline;
-}
-div.paginate div.info span {
-    font-weight: normal;
-    color: #666666;
-}
-div.paginate div.per_page {
-    padding: 6px 0px 0px 15px;
-    font-size: 11px;
-    color: #666666;
-}
-div.paginate div.pages_section {
-    text-align:right;
-    padding-right:10px;
-    float:right;
-    font-size:11px;
-    color: #333;
-}
-div.paginate_btn {
-    width: 20px;
-    height: 16px;
-    margin-top: 7px;
-    float:left;
-    background-position: center 0px;
-    background-repeat: no-repeat;
-}
-div.paginate_btn img {
-    width: 20px;
-    height: 16px;
-}
-div.paginate_btn:hover {
-    background-position: center -16px;
-}
-div.paginate_btn.notactive {
-    background-position: center -32px;
-}
-div.paginate div.pages_section div.not_active_page {
-    float:left;
-
-    padding:0 5px 0;
-    padding-top:8px;
-    text-align:center;
-    color:#3333CC;
-}
-div.paginate div.pages_section div.active_page {
-    float:left;
-
-    background-color:#FFFFFF;
-    text-align:center;
-    margin-left:2px;
-    margin-right:2px;
-    font-weight:bold;
-    padding:8px 4px 3px;
-    color:#333333;
+.bx-paginate-simple .bx-btn-small {
+    font-size:18px; 
+    line-height:16px; /* 20 */
 }
 
+.bx-paginate-btns,
+.bx-paginate-info {
+    float:right;
+}
 
+.bx-paginate-view-all {
+    float:left;
+}
+
+.bx-paginate-btn-next {
+    margin-left:5px;
+}

trunk/templates/base/messageBox.html

@@ -1 +1 @@
 <div class="bx-msg-box-container bx-def-margin-top bx-def-margin-bottom" id="__id__">
-    <table class="bx-msg-box">
-        <tr>
-            <td class="bx-def-padding">
-                __msgText__
-            </td>
-        <tr>
-    </table>
+    <div class="bx-msg-box bx-def-padding">
+        __msgText__
+    </div>
     <bx_if:timer>
         <script type="text/javascript" language="javascript">

trunk/templates/base/paginate.html

@@ -1 @@
-<div class="paginate">
+<div class="bx-paginate __paginate_class__">
+
+    <div class="bx-paginate-btns bx-def-margin-sec-left">
+        __btn_prev__
+        __btn_next__
+    </div>
+
     <bx_if:info>
-        <div class="info">
-            __from__-__to__ <span>__of__</span> __total__
+        <div class="bx-paginate-info">
+            __text__
         </div>
     </bx_if:info>
+
     <bx_if:view_all>
-        <div class="view_all" style="background-image:url(__img_src__)">
+        <div class="bx-paginate-view-all">
             <a href="__lnk_url__" title="__lnk_title__">__lnk_content__</a>
         </div>
     </bx_if:view_all>
-    <bx_if:reloader>
-        <div class="reloader">
-            <div class="paginate_btn" style="background-image:url(__btn_img_src__)">
-                <a href="__lnk_url__" title="__lnk_title__" __lnk_on_click__>
-                    <img src="__img_src__" alt="__img_title__" alt="__img_title__"/>
-                </a>
-            </div>
-        </div>
-    </bx_if:reloader>
-    <bx_if:per_page>
-        <div class="per_page">
-            __per_page_caption__&nbsp;
-            <select name="per_page" onchange="__per_page_on_change__">
-                <bx_repeat:options>
-                    <option value="__opt_value__" __opt_selected__>__opt_caption__</option>
-                </bx_repeat:options>
-            </select>
-        </div>
-    </bx_if:per_page>
 
-    <div class="pages_section">__content__</div>
-    <div class="clear_both"></div>
+    <div class="bx-clear"></div>
+
 </div>

trunk/templates/base/scripts/BxBasePaginate.php

@@ -16 +16 @@
     function BxBasePaginate($aParams, $oTemplate) {
         parent::BxDolPaginate($aParams, $oTemplate);
-
-        //--- Templates ---//
-        $sSpacerUrl = $this->_oTemplate->getIconUrl('spacer.gif');
-        $this->_sButtonActiveTmpl = '<div class="paginate_btn" style="background-image:url(__btn_img_src__)"><a href="__lnk_url__" title="__lnk_title__" __lnk_on_click__><img src="' . $sSpacerUrl . '" alt="__img_title__" alt="__img_title__"/></a></div>';
-        $this->_sButtonInactiveTmpl = '<div class="paginate_btn notactive" style="background-image:url(__btn_img_src__)"><img src="' . $sSpacerUrl . '" alt="__img_title__" title="__img_title__" /></div>';
-
-        $this->_sLinkActiveTmpl = '<div class="not_active_page"><a href="__lnk_url__" title="__lnk_title__" __lnk_on_click__>__lnk_content__</a></div>';
-        $this->_sLinkInactiveTmpl = '<div class="active_page">__lnk_content__</div>';
-        $this->_sSortingTmpl = '__title__&nbsp;<select __on_click__>__content__</select>';
     }
 }