diff options
| -rwxr-xr-x | list_assemblies.php | 2 | ||||
| -rwxr-xr-x | templates/center_list_assemblies.php | 57 | ||||
| -rwxr-xr-x | templates/center_list_components.php | 38 | ||||
| -rwxr-xr-x | templates/list_assemblies.tpl | 142 | ||||
| -rwxr-xr-x | templates/list_assemblies2.tpl | 76 | ||||
| -rw-r--r-- | templates/list_assemblies_simple.tpl | 70 | ||||
| -rwxr-xr-x | templates/user_galleries.tpl | 79 |
7 files changed, 129 insertions, 335 deletions
diff --git a/list_assemblies.php b/list_assemblies.php index 1a2bee5..69e9db8 100755 --- a/list_assemblies.php +++ b/list_assemblies.php @@ -32,7 +32,7 @@ if (!empty($_REQUEST['user_id']) && is_numeric($_REQUEST['user_id'])) { $gBitSmarty->assign('gQueryUserId', $_REQUEST['user_id']); $template = 'user_galleries.tpl'; } else { - $template = 'list_assemblies_simple.tpl'; + $template = 'list_assemblies.tpl'; } $galleryList = $gStockAssembly->getList( $_REQUEST ); diff --git a/templates/center_list_assemblies.php b/templates/center_list_assemblies.php deleted file mode 100755 index c50b0c9..0000000 --- a/templates/center_list_assemblies.php +++ /dev/null @@ -1,57 +0,0 @@ -<?php -global $gQueryUser; -if( !empty( $moduleParams ) ) { - extract( $moduleParams ); -} -use Bitweaver\Stock\StockAssembly; -use Bitweaver\BitBase; - -$gStockAssembly = new StockAssembly(); - -/* Get a list of galleries which matches the imput paramters (default is to list every gallery in the system) */ -$listHash['root_only'] = true; -$listHash['get_thumbnails'] = true; -/* Not supported in StockAssembly::getList -if( !empty( $module_params['assembly_id'] ) && is_numeric( $module_params['assembly_id'] ) ) { - $listHash['assembly_id'] = $module_params['assembly_id']; -}*/ -if ($gQueryUserId) { - $listHash['user_id'] = $gQueryUserId; -} elseif( !empty( $module_params['user_id'] ) && BitBase::verifyId( $module_params['user_id'] ) ) { - $listHash['user_id'] = $module_params['user_id']; -} -if( !empty( $module_params['contain_item'] ) && BitBase::verifyId( $module_params['contain_item'] ) ) { - $listHash['contain_item'] = $module_params['contain_item']; -} -$listHash['sort_mode'] = !empty( $module_params['sort_mode'] ) - ? $module_params['sort_mode'] - : 'created_desc'; -if( !empty( $module_params['nav_bar'] ) ){ - $gBitSmarty->assign('navBar', $module_params['nav_bar']); -}else{ - $gBitSmarty->assign('navBar',true); -} -if( !empty( $module_params['max_records'] ) ){ - $listHash['max_records'] = $module_params['max_records']; -} - -$galleryList = $gStockAssembly->getList( $listHash ); -// support for div/ul/li listing of galleries -$gBitSmarty->assign( 'galleryList', $galleryList ); - -/* Process the input parameters this page accepts */ -if (!empty($gQueryUser) && $gQueryUser->isRegistered()) { - $gBitSmarty->assign('gQueryUserId', $gQueryUser->mUserId); - $template = 'user_galleries.tpl'; -} else { - $template = 'list_assemblies.tpl'; -} -if (!empty($_REQUEST['offset']) && is_numeric($_REQUEST['offset'])) { - $gBitSmarty->assign('iMaxRows', $iMaxRows); -} -if (!empty($_REQUEST['sort_mode'])) { - $gBitSmarty->assign('iSortMode', $_REQUEST['sort_mode']); -} -if (!empty($_REQUEST['search'])) { - $gBitSmarty->assign('iSearchString', $iSearchtring); -} diff --git a/templates/center_list_components.php b/templates/center_list_components.php deleted file mode 100755 index 85d0999..0000000 --- a/templates/center_list_components.php +++ /dev/null @@ -1,38 +0,0 @@ -<?php -global $gQueryUser, $moduleParams; -extract( $moduleParams ); -$gStockComponent = new StockComponent(); - -if( !empty( $module_rows ) ) { - $_REQUEST['max_records'] = $module_rows; -} elseif (!empty($_REQUEST['offset']) && is_numeric($_REQUEST['offset'])) { - $gBitSmarty->assign('iMaxRows', $iMaxRows); -} -if (empty($_REQUEST['sort_mode'])) { - $_REQUEST['sort_mode'] = 'random'; -} -if (!empty($_REQUEST['search'])) { - $gBitSmarty->assign('iSearchString', $iSearchtring); -} - -$gBitSmarty->assign('iSortMode', $_REQUEST['sort_mode']); - -/* Get a list of galleries which matches the imput paramters (default is to list every gallery in the system) */ -if( !empty( $gQueryUser ) && $gQueryUser->mUserId ) { - $_REQUEST['user_id'] = $gQueryUser->mUserId; -} -$_REQUEST['root_only'] = true; -$_REQUEST['get_thumbnails'] = true; -$thumbnailList = $gStockComponent->getList( $_REQUEST ); -$gBitSmarty->assign('thumbnailList', $thumbnailList); - -/* Process the input parameters this page accepts */ -if (!empty($gQueryUser) && $gQueryUser->isRegistered()) { - $gBitSmarty->assign('gQuerUserId', $gQueryUser->mUserId); - $template = 'user_galleries.tpl'; -} else { - $template = 'list_assemblies.tpl'; -} - -$gBitSmarty->assign( 'stock_center_params', $module_params ); -?> diff --git a/templates/list_assemblies.tpl b/templates/list_assemblies.tpl index b440b74..4e91b8c 100755 --- a/templates/list_assemblies.tpl +++ b/templates/list_assemblies.tpl @@ -2,111 +2,69 @@ <div class="listing stock"> <header> <div class="floaticon"> - {if $gBitUser->hasPermission('p_stock_create')} - <a href="{$smarty.const.STOCK_PKG_URL}edit_assembly.php">{biticon ipackage="icons" iname="view-list-icons" iexplain="Create Assembly"}</a> - {/if} - {minifind prompt="Assemblies"} + <button type="button" class="btn btn-link" onclick="window.print()">{biticon ipackage="icons" iname="document-print" iexplain="Print"}</button> + {minifind prompt="Assemblies" gallery_id=$smarty.request.gallery_id} </div> <h1>{tr}Assemblies{/tr}{if $gQueryUserId} {tr}by{/tr} {displayname user_id=$gQueryUserId}{/if}</h1> </header> <section class="body"> - <ul class="list-inline sortby"> - <li>{biticon ipackage="icons" iname="go-next" iexplain="sort by"}</li> - {if $gBitSystem->isFeatureActive('stock_list_title')} - <li>{smartlink ititle="Gallery Name" isort="title" user_id=$gQuerUserId offset=$iMaxRows home=$userInfo.login search=$iSearchString}</li> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_user')} - <li>{smartlink ititle="Owner" isort=$gBitSystem->getConfig('users_display_name') user_id=$gQuerUserId offset=$iMaxRows home=$userInfo.login search=$iSearchString}</li> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_created')} - <li>{smartlink ititle="Created" isort="created" user_id=$gQuerUserId offset=$iMaxRows home=$userInfo.login search=$iSearchString}</li> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_lastmodif')} - <li>{smartlink ititle="Last Modified" isort="last_modified" user_id=$gQuerUserId offset=$iMaxRows home=$userInfo.login search=$iSearchString}</li> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_hits')} - <li>{smartlink ititle="Hits" isort="hits" user_id=$gQuerUserId offset=$iMaxRows home=$userInfo.login search=$iSearchString}</li> - {/if} - </ul> + {if $parentAssembly && $parentAssembly->isValid()} + <p> + <a href="{$smarty.const.STOCK_PKG_URL}list_assemblies.php">{tr}All Assemblies{/tr}</a> + › {$parentAssembly->getTitle()|escape} + </p> + {/if} - <div class="form-group"> - <div class="row galleries"> - {* math assign=quarterValue equation="round(c/4)" c=$galleryList|count *} + <table class="table table-striped table-hover"> + <thead> + <tr> + <th style="width:60px"></th> + <th>{smartlink ititle="Name" isort="title" idefault=1 icontrol=$listInfo}</th> + {if $gBitSystem->isFeatureActive('stock_list_user')}<th>{tr}Owner{/tr}</th>{/if} + {if $gBitSystem->isFeatureActive('stock_list_created')}<th>{smartlink ititle="Created" isort="created" icontrol=$listInfo}</th>{/if} + {if $gBitSystem->isFeatureActive('stock_list_lastmodif')}<th>{smartlink ititle="Modified" isort="last_modified" icontrol=$listInfo}</th>{/if} + {if $gBitSystem->isFeatureActive('stock_list_hits')}<th>{smartlink ititle="Hits" isort="hits" icontrol=$listInfo}</th>{/if} + </tr> + </thead> + <tbody> {foreach from=$galleryList key=galleryId item=gal} - <div class="col-xs-6 col-sm-4 col-md-3 "> - <div class="{$gal.content_type_guid} thumbnail"> - {if $gBitSystem->isFeatureActive('stock_list_thumbnail') && $gal.display_url} - {assign var=thumbnailUri value=$gBitSystem->getParameter( $gal, 'thumbnail_uri', "`$smarty.const.STOCK_PKG_URL`image/no_image.png")} - <a href="{$gal.display_url}"><div class="square" style="background-image:url('{$thumbnailUri}');"alt="{$gal.title|escape}" - title="{$gal.title|truncate:50|escape}" - {if !empty($gal.data)} - data-toggle="popover" data-trigger="click hover focus" data-placement="top" data-content="{$gal.data|truncate}" - {/if}> - <img src="{$thumbnailUri}" alt="{$gal.title|escape}"><h3 class="gallery-title"><a href="{$gal.display_url}"> - {if $gBitSystem->isFeatureActive('stock_list_title')} - {$gal.title|truncate|escape} - {else} - {tr}Gallery{/tr} {$gal.gallery_id} - {/if} - </a> - </h3><div class="security" style="position:absolute; top:5%;right:5%;color:#fff;"> - {if $gal.is_hidden=='y' || $gal.is_private=='y' || $gal.access_answer} - {biticon ipackage="icons" iname="lock" iexplain="Security" label=true} + <tr> + <td> + {if $gal.thumbnail_url} + <a href="{$gal.display_url|escape}"> + <img src="{$gal.thumbnail_url|escape}" alt="{$gal.title|escape}" style="max-height:48px;max-width:56px"/> + </a> {/if} - {if $gal.is_hidden=='y'} - <span style="padding:5px;">{tr}Hidden{/tr}</span> + </td> + <td> + {if $gal.child_count > 0} + <a href="{$smarty.const.STOCK_PKG_URL}list_assemblies.php?gallery_id={$gal.content_id}">{$gal.title|escape}</a> + {else} + <a href="{$gal.display_url|escape}">{$gal.title|escape}</a> {/if} - {if $gal.is_private=='y'} - <span style="padding:5px;">{tr}Private{/tr}</span> + {if $gal.is_hidden|default:'n' == 'y' || $gal.is_private|default:'n' == 'y' || $gal.access_answer|default:false} + {biticon ipackage="icons" iname="lock" iexplain="Restricted"} {/if} - {if $gal.access_answer} - <span style="padding:5px;">{tr}Password{/tr}</span> + {if $gal.data} + <br/><small class="text-muted">{$gal.data|truncate:250|escape}</small> {/if} - </div></div></a> - {/if} - <div class="caption"> - - {if $gBitSystem->isFeatureActive('stock_list_user')} - <strong>{displayname hash=$gal nolink=true}</strong> <small><a href="{$smarty.const.STOCK_PKG_URL}list_assemblies.php?user_id={$gal.user_id}" style="display:block;">{tr}Galleries{/tr}</a></small> - {/if} - {* if $galleryList[ix]->isProtected()} - {biticon ipackage="icons" iname="lock" iexplain="Protected"} - {/if *} - - {if $gBitSystem->isFeatureActive('stock_list_created' ) || $gBitSystem->isFeatureActive('stock_list_lastmodif' )} - <div class="date"> - {if $gBitSystem->isFeatureActive('stock_list_created' ) } - <strong>{tr}Created{/tr}:</strong> {$gal.created|bit_short_date}<br /> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_lastmodif' )} - <strong>{tr}Modified{/tr}:</strong> {$gal.last_modified|bit_short_date}<br /> - {/if} - </div> - {/if} - - <!--{if $gBitSystem->isFeatureActive('stock_list_hits')} - <small><strong>{tr}Hits{/tr}:</strong> {$gal.hits}</small> - {/if}--> - - {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gal} - - {if $gBitUser->hasPermission('p_stock_update')} - <a href="{$smarty.const.STOCK_PKG_URL}edit_assembly.php?content_id={$gal.content_id}">{biticon ipackage="icons" iname="edit" iexplain="Edit"}</a> - {/if} - - </div> - </div> - </div> - - {/foreach} - </div> - </div> + </td> + {if $gBitSystem->isFeatureActive('stock_list_user')}<td>{displayname hash=$gal nolink=true}</td>{/if} + {if $gBitSystem->isFeatureActive('stock_list_created')}<td>{$gal.created|bit_short_date}</td>{/if} + {if $gBitSystem->isFeatureActive('stock_list_lastmodif')}<td>{$gal.last_modified|bit_short_date}</td>{/if} + {if $gBitSystem->isFeatureActive('stock_list_hits')}<td>{$gal.hits}</td>{/if} + </tr> + {foreachelse} + <tr><td colspan="6" class="norecords">{tr}No assemblies found.{/tr}</td></tr> + {/foreach} + </tbody> + </table> <nav> - {pagination gallery_id=$gContent->mGalleryId} + {pagination gallery_id=$smarty.request.gallery_id} </nav> - </section> <!-- end .body --> + </section> +</div> {/strip} -</div> <!-- end .stock --> diff --git a/templates/list_assemblies2.tpl b/templates/list_assemblies2.tpl deleted file mode 100755 index 24169ba..0000000 --- a/templates/list_assemblies2.tpl +++ /dev/null @@ -1,76 +0,0 @@ -{strip} -<div class="listing stock"> - <header> - <div class="floaticon"> - {minifind prompt="Assemblies"} - </div> - <h1>{tr}Assemblies{/tr}{if $gQueryUserId} {tr}by{/tr} {displayname user_id=$gQueryUserId}{/if}</h1> - </header> - - <section class="body"> - <ul class="list-inline sortby"> - <li>{biticon ipackage="icons" iname="go-next" iexplain="sort by" iforce="icon"}</li> - {if $gBitSystem->isFeatureActive('stock_list_title')} - <li>{smartlink ititle="Name" isort="title"}</li> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_user')} - <li>{smartlink ititle="Owner" isort=$gBitSystem->getConfig('users_display_name')}</li> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_created')} - <li>{smartlink ititle="Created" isort="created"}</li> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_lastmodif')} - <li>{smartlink ititle="Last Modified" isort="last_modified"}</li> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_hits')} - <li>{smartlink ititle="Hits" isort="hits"}</li> - {/if} - </ul> - - <div class="row assemblies"> - {foreach from=$galleryList key=galleryId item=gal} - <div class="col-xs-6 col-sm-4 col-md-3"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"> - <a href="{$gal.display_url|escape}"> - {if $gBitSystem->isFeatureActive('stock_list_title')} - {$gal.title|truncate|escape} - {else} - {tr}Assembly{/tr} {$gal.content_id} - {/if} - </a> - {if $gal.is_hidden|default:'n' == 'y' || $gal.is_private|default:'n' == 'y' || $gal.access_answer|default:false} - {biticon ipackage="icons" iname="lock" iexplain="Restricted"} - {/if} - </h3> - </div> - <div class="panel-body"> - {if $gBitSystem->isFeatureActive('stock_list_user')} - <small>{displayname hash=$gal nolink=true}</small> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_created')} - <div class="text-muted small">{$gal.created|bit_short_date}</div> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_lastmodif')} - <div class="text-muted small">{tr}Modified:{/tr} {$gal.last_modified|bit_short_date}</div> - {/if} - {if $gBitSystem->isFeatureActive('stock_list_hits')} - <div class="text-muted small">{tr}Hits:{/tr} {$gal.hits}</div> - {/if} - {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gal} - </div> - </div> - </div> - {foreachelse} - <div class="col-xs-12 norecords">{tr}No assemblies found.{/tr}</div> - {/foreach} - </div> - - <nav> - {pagination} - </nav> - - </section> -</div> -{/strip} diff --git a/templates/list_assemblies_simple.tpl b/templates/list_assemblies_simple.tpl deleted file mode 100644 index 4e91b8c..0000000 --- a/templates/list_assemblies_simple.tpl +++ /dev/null @@ -1,70 +0,0 @@ -{strip} -<div class="listing stock"> - <header> - <div class="floaticon"> - <button type="button" class="btn btn-link" onclick="window.print()">{biticon ipackage="icons" iname="document-print" iexplain="Print"}</button> - {minifind prompt="Assemblies" gallery_id=$smarty.request.gallery_id} - </div> - <h1>{tr}Assemblies{/tr}{if $gQueryUserId} {tr}by{/tr} {displayname user_id=$gQueryUserId}{/if}</h1> - </header> - - <section class="body"> - {if $parentAssembly && $parentAssembly->isValid()} - <p> - <a href="{$smarty.const.STOCK_PKG_URL}list_assemblies.php">{tr}All Assemblies{/tr}</a> - › {$parentAssembly->getTitle()|escape} - </p> - {/if} - - <table class="table table-striped table-hover"> - <thead> - <tr> - <th style="width:60px"></th> - <th>{smartlink ititle="Name" isort="title" idefault=1 icontrol=$listInfo}</th> - {if $gBitSystem->isFeatureActive('stock_list_user')}<th>{tr}Owner{/tr}</th>{/if} - {if $gBitSystem->isFeatureActive('stock_list_created')}<th>{smartlink ititle="Created" isort="created" icontrol=$listInfo}</th>{/if} - {if $gBitSystem->isFeatureActive('stock_list_lastmodif')}<th>{smartlink ititle="Modified" isort="last_modified" icontrol=$listInfo}</th>{/if} - {if $gBitSystem->isFeatureActive('stock_list_hits')}<th>{smartlink ititle="Hits" isort="hits" icontrol=$listInfo}</th>{/if} - </tr> - </thead> - <tbody> - {foreach from=$galleryList key=galleryId item=gal} - <tr> - <td> - {if $gal.thumbnail_url} - <a href="{$gal.display_url|escape}"> - <img src="{$gal.thumbnail_url|escape}" alt="{$gal.title|escape}" style="max-height:48px;max-width:56px"/> - </a> - {/if} - </td> - <td> - {if $gal.child_count > 0} - <a href="{$smarty.const.STOCK_PKG_URL}list_assemblies.php?gallery_id={$gal.content_id}">{$gal.title|escape}</a> - {else} - <a href="{$gal.display_url|escape}">{$gal.title|escape}</a> - {/if} - {if $gal.is_hidden|default:'n' == 'y' || $gal.is_private|default:'n' == 'y' || $gal.access_answer|default:false} - {biticon ipackage="icons" iname="lock" iexplain="Restricted"} - {/if} - {if $gal.data} - <br/><small class="text-muted">{$gal.data|truncate:250|escape}</small> - {/if} - </td> - {if $gBitSystem->isFeatureActive('stock_list_user')}<td>{displayname hash=$gal nolink=true}</td>{/if} - {if $gBitSystem->isFeatureActive('stock_list_created')}<td>{$gal.created|bit_short_date}</td>{/if} - {if $gBitSystem->isFeatureActive('stock_list_lastmodif')}<td>{$gal.last_modified|bit_short_date}</td>{/if} - {if $gBitSystem->isFeatureActive('stock_list_hits')}<td>{$gal.hits}</td>{/if} - </tr> - {foreachelse} - <tr><td colspan="6" class="norecords">{tr}No assemblies found.{/tr}</td></tr> - {/foreach} - </tbody> - </table> - - <nav> - {pagination gallery_id=$smarty.request.gallery_id} - </nav> - - </section> -</div> -{/strip} diff --git a/templates/user_galleries.tpl b/templates/user_galleries.tpl index 522663e..ddf4e4e 100755 --- a/templates/user_galleries.tpl +++ b/templates/user_galleries.tpl @@ -1 +1,78 @@ -{include file="bitpackage:stock/list_assemblies2.tpl"} +{strip} +<div class="listing stock"> + <header> + <div class="floaticon"> + {minifind prompt="Assemblies"} + </div> + <h1>{tr}Assemblies{/tr}{if $gQueryUserId} {tr}by{/tr} {displayname user_id=$gQueryUserId}{/if}</h1> + </header> + + <section class="body"> + {if !$gQueryUserId} + <ul class="list-inline sortby"> + <li>{biticon ipackage="icons" iname="go-next" iexplain="sort by" iforce="icon"}</li> + {if $gBitSystem->isFeatureActive('stock_list_title')} + <li>{smartlink ititle="Name" isort="title"}</li> + {/if} + {if $gBitSystem->isFeatureActive('stock_list_user')} + <li>{smartlink ititle="Owner" isort=$gBitSystem->getConfig('users_display_name')}</li> + {/if} + {if $gBitSystem->isFeatureActive('stock_list_created')} + <li>{smartlink ititle="Created" isort="created"}</li> + {/if} + {if $gBitSystem->isFeatureActive('stock_list_lastmodif')} + <li>{smartlink ititle="Last Modified" isort="last_modified"}</li> + {/if} + {if $gBitSystem->isFeatureActive('stock_list_hits')} + <li>{smartlink ititle="Hits" isort="hits"}</li> + {/if} + </ul> + {/if} + + <div class="row assemblies"> + {foreach from=$galleryList key=galleryId item=gal} + <div class="col-xs-6 col-sm-4 col-md-3"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h3 class="panel-title"> + <a href="{$gal.display_url|escape}"> + {if $gBitSystem->isFeatureActive('stock_list_title')} + {$gal.title|truncate|escape} + {else} + {tr}Assembly{/tr} {$gal.content_id} + {/if} + </a> + {if $gal.is_hidden|default:'n' == 'y' || $gal.is_private|default:'n' == 'y' || $gal.access_answer|default:false} + {biticon ipackage="icons" iname="lock" iexplain="Restricted"} + {/if} + </h3> + </div> + <div class="panel-body"> + {if $gBitSystem->isFeatureActive('stock_list_user')} + <small>{displayname hash=$gal nolink=true}</small> + {/if} + {if $gBitSystem->isFeatureActive('stock_list_created')} + <div class="text-muted small">{$gal.created|bit_short_date}</div> + {/if} + {if $gBitSystem->isFeatureActive('stock_list_lastmodif')} + <div class="text-muted small">{tr}Modified:{/tr} {$gal.last_modified|bit_short_date}</div> + {/if} + {if $gBitSystem->isFeatureActive('stock_list_hits')} + <div class="text-muted small">{tr}Hits:{/tr} {$gal.hits}</div> + {/if} + {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gal} + </div> + </div> + </div> + {foreachelse} + <div class="col-xs-12 norecords">{tr}No assemblies found.{/tr}</div> + {/foreach} + </div> + + <nav> + {pagination} + </nav> + + </section> +</div> +{/strip} |
