From 750e70a973282dc09b16c155ea233bc470dffaf7 Mon Sep 17 00:00:00 2001 From: lsces Date: Sun, 7 Feb 2016 21:51:22 +0000 Subject: Move from Smarty2 to Smarty3 function style --- assign_content.php | 4 ++-- lookup_pigeonholes_inc.php | 2 +- view.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assign_content.php b/assign_content.php index e2157da..9e15b47 100644 --- a/assign_content.php +++ b/assign_content.php @@ -24,7 +24,7 @@ $gBitSystem->verifyPermission( 'p_pigeonholes_insert_member' ); include_once( PIGEONHOLES_PKG_PATH.'lookup_pigeonholes_inc.php' ); $feedback = ''; -$gBitSmarty->assign_by_ref( 'feedback', $feedback ); +$gBitSmarty->assignByRef( 'feedback', $feedback ); $contentTypes = array( '' => tra( 'All Content' ) ); foreach( $gLibertySystem->mContentTypes as $cType ) { @@ -101,7 +101,7 @@ if(( !empty( $_REQUEST['insert_content'] ) || !empty( $_REQUEST['insert_content_ $assignableContent = $gContent->getAssignableContent( $listHash ); } -$gBitSmarty->assign_by_ref( 'listInfo', $listHash['listInfo'] ); +$gBitSmarty->assignByRef( 'listInfo', $listHash['listInfo'] ); $listHash = array( 'load_only_root' => TRUE, diff --git a/lookup_pigeonholes_inc.php b/lookup_pigeonholes_inc.php index 095d1d7..62ce442 100644 --- a/lookup_pigeonholes_inc.php +++ b/lookup_pigeonholes_inc.php @@ -16,5 +16,5 @@ */ $gContent = new Pigeonholes( ( !empty( $_REQUEST['structure_id'] ) ? $_REQUEST['structure_id'] : NULL ), ( !empty( $_REQUEST['content_id'] ) ? $_REQUEST['content_id'] : NULL ) ); $gContent->load( TRUE ); -$gBitSmarty->assign_by_ref( 'gContent', $gContent ); +$gBitSmarty->assignByRef( 'gContent', $gContent ); ?> diff --git a/view.php b/view.php index 0089e22..0158937 100644 --- a/view.php +++ b/view.php @@ -28,7 +28,7 @@ if (isset($_REQUEST['structure_id'])) { header("Location:".$gContent->getDisplayUrl()); } -$gBitSmarty->assign_by_ref( 'memberFeedback', $memberFeedback = array() ); +$gBitSmarty->assignByRef( 'memberFeedback', $memberFeedback = array() ); // set up structure related stuff global $gStructure; @@ -55,7 +55,7 @@ if( empty( $gStructure ) || !$gStructure->isValid() ) { $gBitSystem->fatalError( tra( 'Invalid structure' )); } -$gBitSmarty->assign_by_ref( 'gStructure', $gStructure ); +$gBitSmarty->assignByRef( 'gStructure', $gStructure ); $gBitSmarty->assign( 'structureInfo', $gStructure->mInfo ); $gBitSmarty->assign( 'subtree', $gStructure->getSubTree( $gStructure->mStructureId ) ); -- cgit v1.3 From bafab752e95de81db23d057347ed715bb19d68bd Mon Sep 17 00:00:00 2001 From: lsces Date: Sun, 7 Feb 2016 21:51:55 +0000 Subject: bootstrap3-css-changes-form-group --- templates/admin_pigeonholes.tpl | 24 ++++++++++++------------ templates/assign_content.tpl | 14 +++++++------- templates/edit_pigeonholes.tpl | 18 +++++++++--------- templates/menu_pigeonholes.tpl | 2 +- templates/service_edit_mini_inc.tpl | 2 +- templates/service_list_options_inc.tpl | 4 ++-- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/templates/admin_pigeonholes.tpl b/templates/admin_pigeonholes.tpl index 8acd0b0..3d516bc 100644 --- a/templates/admin_pigeonholes.tpl +++ b/templates/admin_pigeonholes.tpl @@ -5,7 +5,7 @@ {legend legend="Display Settings"} {foreach from=$pigeonholeDisplaySettings key=feature item=output} -
+
{formlabel label=$output.label for=$feature} {forminput} {html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} @@ -14,7 +14,7 @@
{/foreach} -
+
{formlabel label="Number of Members" for="member_number"} {forminput} {html_options name="pigeonholes_limit_member_number" options=$memberLimit values=$memberLimit selected=$gBitSystem->getConfig('pigeonholes_limit_member_number') id=member_number} @@ -25,7 +25,7 @@ {legend legend="Listing Settings"} {foreach from=$pigeonholeListSettings key=feature item=output} -
+
{formlabel label=$output.label for=$feature} {forminput} {html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} @@ -34,7 +34,7 @@
{/foreach} -
+
{formlabel label="List style" for="pigeonholes_list_style"} {forminput} {html_options name="pigeonholes_list_style" options=$listStyles values=$listStyles selected=$gBitSystem->getConfig('pigeonholes_list_style') id=pigeonholes_list_style} @@ -42,7 +42,7 @@ {/forminput}
-
+
{formlabel label="Member Thumbnail"} {forminput} {html_options values=$imageSizes options=$imageSizes name="pigeonholes_member_thumb" selected=$gBitSystem->getConfig('pigeonholes_member_thumb')} @@ -50,7 +50,7 @@ {/forminput}
-
+
{formlabel label="Table Columns" for="pigeonholes_display_columns"} {forminput} {html_options name="pigeonholes_display_columns" options=$tableColumns values=$tableColumns selected=$gBitSystem->getConfig('pigeonholes_display_columns',3) id=pigeonholes_display_columns} @@ -61,7 +61,7 @@ {legend legend="Pigeonhole Edit Settings"} {foreach from=$pigeonholeEditSettings key=feature item=output} -
+
{formlabel label=$output.label for=$feature} {forminput} {html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} @@ -73,7 +73,7 @@ {legend legend="Pigeonhole Content Edit Settings"} {foreach from=$pigeonholeContentEditSettings key=feature item=output} -
+
{formlabel label=$output.label for=$feature} {forminput} {html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} @@ -82,7 +82,7 @@
{/foreach} -
+
{formlabel label="Number of categories for a scrolling list" for="pigeonholes_scrolling_list_number"} {forminput} @@ -93,7 +93,7 @@ {legend legend="Pigeonholeable Content"} -
+
{formlabel label="Pigeonholeable Content"} {forminput} {html_checkboxes options=$formPigeonholeable.guids value=y name=pigeonholeable_content separator="
" checked=$formPigeonholeable.checked} @@ -102,8 +102,8 @@
{/legend} -
- +
+
{/form} {/strip} diff --git a/templates/assign_content.tpl b/templates/assign_content.tpl index 5e0f8c0..768fa78 100644 --- a/templates/assign_content.tpl +++ b/templates/assign_content.tpl @@ -10,7 +10,7 @@ {else} {form legend="Assign Content"} -
+
{formlabel label="Restrict listing" for="content_type"} {forminput} @@ -48,7 +48,7 @@ {/forminput}
-
+
{formlabel label="Category" for="root_structure_id"} {forminput} {html_options values=$pigeonRoots options=$pigeonRoots name=root_structure_id id=root_structure_id selected=$smarty.request.root_structure_id} @@ -56,8 +56,8 @@ {/forminput}
-
- +
+
{/form} @@ -166,14 +166,14 @@ {/if} {if $assignableContent} -
+
{if $smarty.request.include == 'members' && $listInfo.current_page < $listInfo.total_pages} {/if}
-
- +
+
diff --git a/templates/edit_pigeonholes.tpl b/templates/edit_pigeonholes.tpl index 4fe0fbb..61fd8d4 100644 --- a/templates/edit_pigeonholes.tpl +++ b/templates/edit_pigeonholes.tpl @@ -16,7 +16,7 @@ -
+
{formlabel label="Parent" for="pigeonhole-parent"} {forminput} {* we need to disable dropdown when editing since it might confus users when nothing happens *} @@ -30,7 +30,7 @@
{/if} -
+
{formlabel label="Title" for="pigeonhole-title"} {forminput} @@ -38,13 +38,13 @@
{if $gBitSystem->isFeatureActive('pigeonholes_display_description')} -
+
{textarea id="pigeonhole-desc" name="pigeonhole[edit]" help="A description of the category. This will be visible when users view this particular category." label="Description"}{$pigeonInfo.data}{/textarea}
{/if} {if $gBitSystem->isFeatureActive( 'pigeonholes_allow_forbid_insertion') } -
+
{formlabel label="Forbid Content Insertion" for="pigeonhole-no-insert"} {forminput} mPrefs.no_insert}checked="checked"{/if} /> @@ -54,7 +54,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'pigeonholes_themes' )} -
+
{formlabel label="Theme" for="pigeonhole-style"} {forminput} {html_options id="pigeonhole-style" name="pigeonhole[prefs][style]" output=$styles values=$styles selected=$gContent->mPrefs.style} @@ -64,7 +64,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'pigeonholes_permissions' )} -
+
{formlabel label="Permission" for="perm"} {forminput} {html_options name="pigeonhole[prefs][permission]" id="perm" options=$perms selected=$gContent->mPrefs.permission} @@ -74,7 +74,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'pigeonholes_groups' )} -
+
{formlabel label="Group" for="group_id"} {forminput} {html_options name="pigeonhole[prefs][group_id]" id="group_id" options=$groups selected=$gContent->mPrefs.group_id} @@ -85,8 +85,8 @@ {include file="bitpackage:liberty/edit_storage_list.tpl"} -
- +
+
{/legend} {/jstab} diff --git a/templates/menu_pigeonholes.tpl b/templates/menu_pigeonholes.tpl index 8b677a0..7bbd02f 100644 --- a/templates/menu_pigeonholes.tpl +++ b/templates/menu_pigeonholes.tpl @@ -19,7 +19,7 @@ {/if} {if $gBitUser->hasPermission( 'p_pigeonholes_insert_member' )} -
  • {booticon iname="icon-paper-clip" iexplain="Assign Content" ilocation=menu}
    • +
  • {booticon iname="icon-paperclip" iexplain="Assign Content" ilocation=menu}
    • {/if} {/strip} diff --git a/templates/service_edit_mini_inc.tpl b/templates/service_edit_mini_inc.tpl index 5412a1f..2893b0c 100644 --- a/templates/service_edit_mini_inc.tpl +++ b/templates/service_edit_mini_inc.tpl @@ -1,6 +1,6 @@ {strip} {if $editPigeonholesEnabled && $gBitUser->hasPermission( 'p_pigeonholes_insert_member' )} -
    +
    {formlabel label="Categorize" for="pigeonholes"} {if $pigeonPathList|@count ne 0} {forminput} diff --git a/templates/service_list_options_inc.tpl b/templates/service_list_options_inc.tpl index 6da832f..cf1df71 100644 --- a/templates/service_list_options_inc.tpl +++ b/templates/service_list_options_inc.tpl @@ -4,8 +4,8 @@ {html_checkboxes options=$pigeonList values=$pigeonList selected=$smarty.request.pigeonholes.filter name="pigeonholes[filter]" separator="   "}
    - - + +
    -- cgit v1.3