stock: remove gallery layout machinery — assembly view hardcoded to simple_list; delete assembly_views/; drop pagination constants, getLayout/getAllLayouts, per-page config

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

3 files changed, 113 insertions, 66 deletions

diff --git a/templates/stock_fixed_grid_inc.tpl b/templates/stock_fixed_grid_inc.tpl
new file mode 100755
index 0000000..d6f0ba0
--- /dev/null
+++ b/templates/stock_fixed_grid_inc.tpl
@@ -0,0 +1,39 @@
+{strip}
+{include file="bitpackage:stock/assembly_nav.tpl"}
+<div class="display stock container">
+	<div class="header col-xs-12">
+		{include file="bitpackage:stock/assembly_icons_inc.tpl"}
+		<h1>{$gContent->getTitle()|escape}</h1>
+	</div>
+
+	<div class="body">
+		{formfeedback success=$stockSuccess error=$stockErrors warning=$stockWarnings}
+
+		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
+		{if $gContent->mInfo.data}
+			<p>{$gContent->mInfo.data|escape}</p>
+		{/if}
+
+		<table class="thumbnailblock">
+		{counter assign="itemCount" start="0" print=false}
+		{foreach from=$gContent->mItems item=galItem key=itemContentId}
+			{if $itemCount % 4 == 0}<tr>{/if}
+			<td style="width:25%; vertical-align:top;">
+				{box class="box {$galItem->mInfo.content_type_guid}"}
+					<h4><a href="{$galItem->getDisplayUrl()|escape}">{$galItem->mInfo.title|escape}</a></h4>
+					{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$galItem->mInfo type=mini}
+					{if $gBitSystem->isFeatureActive('stock_gallery_list_image_descriptions')}
+						<p>{$galItem->mInfo.data|escape}</p>
+					{/if}
+				{/box}
+			</td>
+			{counter name=itemCount}
+			{if $itemCount % 4 == 0}</tr>{/if}
+		{/foreach}
+		{if $itemCount % 4 != 0}</tr>{/if}
+		</table>
+
+		{pagination content_id=$gContent->mContentId}
+	</div><!-- end .body -->
+</div><!-- end .stock -->
+{/strip}
diff --git a/templates/stock_simple_list_inc.tpl b/templates/stock_simple_list_inc.tpl
new file mode 100755
index 0000000..7c46c66
--- /dev/null
+++ b/templates/stock_simple_list_inc.tpl
@@ -0,0 +1,74 @@
+{strip}
+{include file="bitpackage:stock/assembly_nav.tpl"}
+<div class="display stock">
+	<div class="header">
+		{include file="bitpackage:stock/assembly_icons_inc.tpl"}
+		<h1>{$gContent->getTitle()|escape}</h1>
+	</div>
+
+	<div class="body">
+		{formfeedback success=$stockSuccess error=$stockErrors warning=$stockWarnings}
+
+		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
+		{if $gContent->mInfo.data}
+			<p>{$gContent->mInfo.data|escape}</p>
+		{/if}
+
+		<table class="table data">
+			<caption>{tr}Components{/tr} <span class="total">[ {$listInfo.total_records|default:0} ]</span></caption>
+			<tr>
+				<th>{smartlink ititle=Name isort=title icontrol=$listInfo}</th>
+				{if $gBitSystem->isFeatureActive('stock_item_list_date') || $gBitSystem->isFeatureActive('stock_item_list_creator')}
+					<th>{smartlink ititle=Created isort=created iorder=desc idefault=1 icontrol=$listInfo}</th>
+				{/if}
+				{if $gBitSystem->isFeatureActive('stock_item_list_hits')}
+					<th>{smartlink ititle=Views isort="lch.hits" icontrol=$listInfo}</th>
+				{/if}
+				<th>{tr}Actions{/tr}</th>
+			</tr>
+			{foreach from=$gContent->mItems item=galItem}
+				<tr class="{cycle values="odd,even"}">
+					<td>
+						<h3><a href="{$galItem->getDisplayUrl()}">{$galItem->getTitle()|escape}</a></h3>
+						{if $gBitSystem->isFeatureActive('stock_item_list_desc') && $galItem->mInfo.data}
+							{$galItem->mInfo.parsed_data}
+						{/if}
+						{if $gBitSystem->isFeatureActive('stock_item_list_attid')}
+							<small>{$galItem->mInfo.wiki_plugin_link}</small>
+						{/if}
+					</td>
+					{if $gBitSystem->isFeatureActive('stock_item_list_date') || $gBitSystem->isFeatureActive('stock_item_list_creator')}
+						<td>
+							{if $gBitSystem->isFeatureActive('stock_item_list_date')}
+								{$galItem->mInfo.created|bit_short_date}<br />
+							{/if}
+							{if $gBitSystem->isFeatureActive('stock_item_list_creator')}
+								{tr}by{/tr}: {displayname hash=$galItem->mInfo}
+							{/if}
+						</td>
+					{/if}
+					{if $gBitSystem->isFeatureActive('stock_item_list_hits')}
+						<td class="text-right">{$galItem->mInfo.hits|default:"{tr}none{/tr}"}</td>
+					{/if}
+					<td class="actionicon">
+						<a href="{$galItem->getDisplayUrl()}">{biticon ipackage="icons" iname="folder-open" iexplain="View"}</a>
+						{if $gContent->isOwner($galItem->mInfo) || $gBitUser->isAdmin()}
+							<a href="{$smarty.const.STOCK_PKG_URL}edit_component.php?content_id={$galItem->mInfo.content_id}">{biticon ipackage="icons" iname="edit" iexplain="Edit"}</a>
+							<a href="{$smarty.const.STOCK_PKG_URL}edit_component.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{biticon ipackage="icons" iname="user-trash" iexplain="Remove"}</a>
+						{/if}
+					</td>
+				</tr>
+			{/foreach}
+		</table>
+
+	</div><!-- end .body -->
+
+	{pagination content_id=$gContent->mContentId}
+
+	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
+
+	{if $gContent->getPreference('allow_comments') eq 'y'}
+		{include file="bitpackage:liberty/comments.tpl"}
+	{/if}
+</div><!-- end .stock -->
+{/strip}
diff --git a/templates/view_assembly_components_inc.tpl b/templates/view_assembly_components_inc.tpl
deleted file mode 100755
index 7f5ce28..0000000
--- a/templates/view_assembly_components_inc.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-{strip}
-{if $gContent->getLayout() == 'simple_list'}
-	<table class="table data">
-		<caption>{tr}Components{/tr} <span class="total">[ {$gContent->mItems|count|default:0} ]</span></caption>
-		<tr>
-			<th>{smartlink ititle=Name isort=title icontrol=$listInfo}</th>
-			{if $gBitSystem->isFeatureActive( 'stock_item_list_date' ) || $gBitSystem->isFeatureActive( 'stock_item_list_creator' )}
-				<th>{smartlink ititle=Created isort=created iorder=desc idefault=1 icontrol=$listInfo}</th>
-			{/if}
-			{if $gBitSystem->isFeatureActive( 'stock_item_list_hits' )}
-				<th>{smartlink ititle=Views isort="lch.hits" icontrol=$listInfo}</th>
-			{/if}
-			<th>{tr}Actions{/tr}</th>
-		</tr>
-		{foreach from=$gContent->mItems item=galItem}
-			<tr class="{cycle values="odd,even"}">
-				<td>
-					<h3><a href="{$galItem->getDisplayUrl()}">{$galItem->getTitle()|escape}</a></h3>
-					{if $gBitSystem->isFeatureActive( 'stock_item_list_desc' ) && $galItem->mInfo.data}
-						{$galItem->mInfo.parsed_data}
-					{/if}
-					{if $gBitSystem->isFeatureActive( 'stock_item_list_attid' )}
-						<small>{$galItem->mInfo.wiki_plugin_link}</small>
-					{/if}
-				</td>
-				{if $gBitSystem->isFeatureActive( 'stock_item_list_date' ) || $gBitSystem->isFeatureActive( 'stock_item_list_creator' )}
-					<td>
-						{if $gBitSystem->isFeatureActive( 'stock_item_list_date' )}
-							{$galItem->mInfo.created|bit_short_date}<br />
-						{/if}
-						{if $gBitSystem->isFeatureActive( 'stock_item_list_creator' )}
-							{tr}by{/tr}: {displayname hash=$galItem->mInfo}
-						{/if}
-					</td>
-				{/if}
-				{if $gBitSystem->isFeatureActive( 'stock_item_list_hits' )}
-					<td class="text-right">{$galItem->mInfo.hits|default:"{tr}none{/tr}"}</td>
-				{/if}
-				<td class="actionicon">
-					{if $gContent->isOwner( $galItem->mInfo ) || $gBitUser->isAdmin()}
-						<a href="{$smarty.const.STOCK_PKG_URL}edit_component.php?content_id={$galItem->mInfo.content_id}">{biticon ipackage="icons" iname="edit" iexplain="Edit"}</a>
-						<a href="{$smarty.const.STOCK_PKG_URL}edit_component.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{biticon ipackage="icons" iname="user-trash" iexplain="Remove"}</a>
-					{/if}
-				</td>
-			</tr>
-		{foreachelse}
-			<tr><td class="norecords" colspan="4">{tr}This assembly has no components.{/tr}</td></tr>
-		{/foreach}
-	</table>
-{else}
-	<div class="component-list">
-		{foreach from=$gContent->mItems item=galItem key=itemContentId}
-			{box class="box {$galItem->mInfo.content_type_guid}"}
-				{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$galItem->mInfo type=mini}
-				<h2><a href="{$galItem->getDisplayUrl()|escape}">{$galItem->getTitle()|escape}</a></h2>
-				{if $galItem->mInfo.data}
-					<p>{$galItem->mInfo.data|escape|truncate:120}</p>
-				{/if}
-			{/box}
-		{foreachelse}
-			<div class="norecords">{tr}This assembly has no components.{/tr}</div>
-		{/foreach}
-	</div>
-	<div class="clear"></div>
-{/if}
-{/strip}