From ef19a77f6e4c3749d7d8cb819d7323339bf4bf37 Mon Sep 17 00:00:00 2001 From: plegall Date: Wed, 25 May 2011 09:18:32 +0000 Subject: [PATCH] merge r11040 from branch 2.2 to trunk bug 1786 fixed: ability to prefilter the synchronize screen with a specific album by clicking on the new "Synchronize" icon on album admin page or album admin list. This is not the solution proposed by Gotcha (ie a treeview to select the album on the synchronize screen) but it solves the same problem. git-svn-id: http://piwigo.org/svn/trunk@11041 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_list.php | 7 +++++++ admin/cat_modify.php | 9 +++++++++ admin/site_update.php | 10 +++++++++- admin/themes/clear/icon/synchronize.png | Bin 0 -> 1758 bytes admin/themes/default/icon/synchronize.png | Bin 0 -> 782 bytes admin/themes/default/template/cat_list.tpl | 3 +++ admin/themes/default/template/cat_modify.tpl | 3 +++ 7 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 admin/themes/clear/icon/synchronize.png create mode 100644 admin/themes/default/icon/synchronize.png diff --git a/admin/cat_list.php b/admin/cat_list.php index ae957792d..050b7c06a 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -307,6 +307,13 @@ foreach ($categories as $category) $tpl_cat['U_DELETE'] = $self_url.'&delete='.$category['id']; $tpl_cat['U_DELETE'].= '&pwg_token='.get_pwg_token(); } + else + { + if ($conf['enable_synchronization']) + { + $tpl_cat['U_SYNC'] = $base_url.'site_update&site=1&cat_id='.$category['id']; + } + } if ( array_key_exists($category['id'], $categories_with_images) ) { diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 8f99a9155..3c944ce7b 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -270,6 +270,15 @@ else $category['cat_full_dir'] ) ) ); + + if ($conf['enable_synchronization']) + { + $template->assign( + 'U_SYNC', + $base_url.'site_update&site=1&cat_id='.$category['id'] + ); + } + } // representant management diff --git a/admin/site_update.php b/admin/site_update.php index 6b5ae775b..5b90729b8 100644 --- a/admin/site_update.php +++ b/admin/site_update.php @@ -809,8 +809,16 @@ else 'meta_all' => false, 'meta_empty_overrides' => false, ); - + $cat_selected = array(); + + if (isset($_GET['cat_id'])) + { + check_input_parameter('cat_id', $_GET, false, PATTERN_ID); + + $cat_selected = array($_GET['cat_id']); + $tpl_introduction['sync'] = 'files'; + } } $tpl_introduction['privacy_level_options'] = get_privacy_level_options(); diff --git a/admin/themes/clear/icon/synchronize.png b/admin/themes/clear/icon/synchronize.png new file mode 100644 index 0000000000000000000000000000000000000000..72a8c0ec56b53eb9d6bbcd883aea6fc7eb5e9807 GIT binary patch literal 1758 zcmV<41|j*0P)MB!L7N#KwAxjOSUcC2`l{uC+D_*PQsY?ZU=Bv)ylSG_Iq7}tLc6~=j+w7*MEQBNkfdm6ItF>8eeq_zJB@q$_ z_6#3r#YicnR&RSwgpI~FW?-~B`b9@)$NSkpN0pI@zTllvN>p(M70x2cs%s>ZAtJSgIMT^USn%y#EFq_d8EvX;3 z_;BwQckquz+eJK9STQVJ=pWp>Hpxj$LH{LcCLj6yLhIUfjeo?)%!L$94U;l1CDDIY)o z)DZwjaEoX5oDgB0sA4XwKJPuZF$@!dltM}?A*^*GOc+`+oMVKshxZPDKK6P4jHZ0g ztH1f)C~jlJFJ5n**WI2Ca#<}h*_=sSVc=iap1Px}<1YY0g;X}9(QsDe1A$y1ASD6J zIQ7~2D2n})@9g^iAf^$JYtM0pdUUz5P;mcR9AG!Yr`@j3ZjzdkD^1zQ@l7eVay%D!xA093D_kZ2f z*4A3KCi(36vrjaTQb>&rS44B`9HAuv>>&w=okt_Ks6`e!Ukv6iEU&Lt$JgDsG17le z&+b!EqkiT_WhkG`7FUjsjlU+)($*s=b{L8< zWvJ43{DXnsQ=eQLx>}DC4xAUw&KekNkR%3i6mq>b8I4>zdu-t2mwtWY%OeN92^-!e z-o>H!HgbeibLZWK`b2exnY?BI1OPGs0ssL34L}1BLgzBU%&rb0gCdC7+vIvOc4@%d zI0O&_NC3nngIK6c;^Ik9m=YA*$R;(#)@b%d0nh*x00}?>5cn?!-~m{Wa3C^51_nfi zNLm+9dQ2fqj{p!r1QLRTBoYcFBtVh@Fu)8V?;2x_Y5W^UMHWhVvv(~3001R)MObuX zVRU6WV{&C-bY%cCFflMKFfuJMFjO%zIx;vqF)%GKHaajc02_lU0000bbVXQnWMOn= zI&E)cX=ZrPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipZ1 z2O|*oji9Lj00NFlL_t(Y$FO8cVkOky2~1S4Af#U@Qjk54!O$>Mj2L3GdP0EIzi zGuWIse~&-$8h6o$MOce*OJ(4tolaSflMzbCUQH)0P~#(UbXLcRp3 z#)mPOhbK6TS5fBEEZYHG#CrUS=UF9{GMEmJ0Ug3Ke2l&SN`~8qb76M@?M;UNRe&}; z#&z_>j{|tu0zq9koH%dVq9VXs?2p0LV-2=&J{e~)H9=I0vPK@D7gMmeh10vZ68gf> z|0uD28zA`-U?_ga^bG5Teg_8=2bW{z)KZJJsQ^$4(`rdJPXjS!10Nd+wqqDZU>B~U zrBvnEC>L6^l3O9 zJ>L*~lb-BZQ9)Ofbd3=m;KK6EnGoM{z)xMu6EE8TQBWgI0+E4crg1Ta_WH zkXf;QE1~b>xSa;5Mz5=Z_1#h4T5Jto?*uEHcAL>Pb4!jJ+e29RzqnC5B z8jIs1sbrMU8@4BKE09+Us;L(@+6atBe*_y6&yK)%ds6A7=yd~s<3%8*H?r&eCUFtO5itl1rr?nf52^D;}$511gMCm=*x2WVVg`_G%`d0bW?L0fkDTCIA2c M07*qoM6N<$f-aX>8vp{'Permissions'|@translate} {/if} + {if isset($category.U_SYNC) } +
  • {'Synchronize'|@translate}
    • + {/if} {if isset($category.U_DELETE) }
  • {'delete album'|@translate}
    • {/if} diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl index 8c51785e2..0e03aeacd 100644 --- a/admin/themes/default/template/cat_modify.tpl +++ b/admin/themes/default/template/cat_modify.tpl @@ -20,6 +20,9 @@ {if isset($U_MANAGE_PERMISSIONS) }
  • {'Permissions'|@translate}
    • {/if} + {if isset($U_SYNC) } +
  • {'Synchronize'|@translate}
    • + {/if} {if isset($U_DELETE) }
  • {'delete album'|@translate}
    • {/if}