Ignore:
Timestamp:
Aug 1, 2012, 7:00:07 PM (12 years ago)
Author:
rvelices
Message:

merge -r17289 from trunk to 2.4: batch manager improvements/fixes:

  • when refreshing photo set, start is set to 0 (otherwise if the new set is smaller that start, it looks like it is empty)
  • correct positioning of thumbnails (width/height) is done in template instead of javascript (immediate instead on ready + no reflows)
  • less space lost on batch manager page
  • fix wrong page title in batch manager because of global variable $title overriden
  • fix language keys in element_set_ranks (capital/lowercase issue)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/admin/themes/default/theme.css

    r17008 r17290  
    4343  background-color: #333;
    4444  color: #666;
    45   -moz-border-radius: 5px;
     45  border-radius: 5px;
    4646  display: block;
    47   width: 104px;
    48   height: 104px;
     47  width: 120px;
     48  height: 120px;
    4949  cursor: move;
    50   margin: 10px;
     50  margin: 4px;
     51        overflow: hidden;
    5152}
    5253.clipwrapper {
     
    5960  position:absolute;
    6061}
    61 UL.thumbnails li.rank-of-image input {
    62 }
     62
    6363UL.thumbnails SPAN.wrap1 {
    6464  margin: 5px;
     
    7272  display: table-cell;          /* block prevents vertical-align here */
    7373  vertical-align: middle;       /* Ok with Opera and Geko not IE6 */
    74 }
    75 UL.thumbnails LABEL { display: block; border-bottom: none; }
     74        border-radius: 4px;
     75}
     76UL.thumbnails LABEL {
     77        position: relative;
     78        display: block;
     79        border-bottom: none;
     80}
     81
    7682UL.thumbnails IMG {
    77   margin-bottom: -4px;  /* why ??? something wrong with Geko and Opera ignored by IE6*/
    78 }
    79 UL.thumbnails LABEL { position: relative; }
     83        vertical-align: middle;
     84        margin-top: 12px;
     85}
     86
    8087UL.thumbnails INPUT {
    81   position: relative;   /* <= Opera can handle relative here */
    82   top: -20px;
    83 }
    84 :root UL.thumbnails INPUT { /* hide from Opera */
    85   position: absolute;   /* <= Opera hide 1 checkbox over 2 !!! */
     88  position: absolute;
    8689  left: 2px; top: 2px;
    8790}
    8891UL.thumbnails .levelIndicatorB {
    89 display:block; position:absolute; z-index:100;padding:0px 0 0 14px; color:black; font-weight:bold; font-size:120%;
     92display:block; position:absolute; z-index:100; padding:7px 0 0 2px; color:black; font-weight:bold; font-size:120%;
    9093}
    9194UL.thumbnails .levelIndicatorF {
    92 display:block; position:absolute; z-index:101;padding:1px 0 0 15px; color:white; font-weight:bold; font-size:120%;
     95display:block; position:absolute; z-index:101; padding:8px 0 0 3px; color:white; font-weight:bold; font-size:120%;
    9396}
    9497
     
    298301font-weight: normal;
    299302font-style:italic;
    300 padding: 8px 0 0 10px;
     303padding: 2px 0 0 10px;
    301304margin: 0;
    302305float:left;
     
    307310#pwgHead A:hover {color:#fff;border-bottom:1px solid #fff}
    308311
    309 #headActions {float:right; height:46px; line-height:46px; margin-right:10px;}
     312#headActions {float:right; height:36px; line-height:36px; margin-right:10px;}
    310313
    311314A {
     
    590593#pwgHead {
    591594  background-color:#464646;
    592   height:46px;
     595        height: 36px;
    593596}
    594597
     
    604607  bottom:0;
    605608  width:100%;
    606   height:46px;
    607   background: url(images/logo.png) no-repeat 7px 8px;
    608   background-color:#464646;
     609        height: 34px;
     610        line-height: 34px;
     611        background-repeat: no-repeat;
     612        background-position: 7px 2px;
     613        background-color:#464646;
    609614  color:#aaa;
    610   line-height:46px;
    611615}
    612616
     
    768772#thePopuphelpPage #pwgHead {display:none}
    769773#thePopuphelpPage #footer  {display:none}
    770 
    771 /* Set some sizes according to your maximum thumbnail width and height */
    772 UL.thumbnails SPAN,
    773 UL.thumbnails SPAN.wrap2 A,
    774 UL.thumbnails LABEL {
    775   width: 140px;      /* max thumbnail width + 2px */
    776 }
    777 UL.thumbnails SPAN.wrap2 {
    778   height: 140px;    /* max thumbnail height + 2px */
    779 }
    780 
    781774
    782775.themeBox {display:inline-table; text-align:center; height:192px; background-color:#eee; margin:5px; -moz-border-radius:5px; overflow:hidden; }
     
    979972#batchManagerGlobal ul.thumbnails div.actions a:hover {border-color:#fff;}
    980973#batchManagerGlobal ul.thumbnails span.wrap1:hover div.actions {display:block;}
    981 #batchManagerGlobal #selectedMessage {padding:5px; -moz-border-radius:5px;-webkit-border-radius:5px;}
     974#batchManagerGlobal #selectedMessage {padding:5px; border-radius:5px;}
    982975#batchManagerGlobal #selectSet a {border-bottom:1px dotted;}
    983976#batchManagerGlobal #applyOnDetails {font-style:italic;}
Note: See TracChangeset for help on using the changeset viewer.