summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorlsces <lester@lsces.co.uk>2014-12-09 08:54:36 +0000
committerlsces <lester@lsces.co.uk>2014-12-09 08:54:36 +0000
commit6b9bc82d8bc26cf79d62ad7bdab95bd4b265a9a0 (patch)
treeb286bd3c82f7d9cec92518fd6072aaaa9aac0e45 /templates
parent567eaf9ce66848be11f4e4abeb2d4978c909fb71 (diff)
parentd4c62ec272da428633c482dc1a44964f4e2b0677 (diff)
downloadliberty-6b9bc82d8bc26cf79d62ad7bdab95bd4b265a9a0.tar.gz
liberty-6b9bc82d8bc26cf79d62ad7bdab95bd4b265a9a0.tar.bz2
liberty-6b9bc82d8bc26cf79d62ad7bdab95bd4b265a9a0.zip
Merge
Diffstat (limited to 'templates')
-rw-r--r--templates/edit_format.tpl8
-rw-r--r--templates/mime/audio/edit.tpl4
-rw-r--r--templates/mime/image/edit.tpl4
-rw-r--r--templates/service_content_icon_inc.tpl6
4 files changed, 6 insertions, 16 deletions
diff --git a/templates/edit_format.tpl b/templates/edit_format.tpl
index 1f9922c..04b66af 100644
--- a/templates/edit_format.tpl
+++ b/templates/edit_format.tpl
@@ -42,8 +42,7 @@
{formlabel label="Content Format"}
{foreach name=formatPlugins from=$gLibertySystem->mPlugins item=plugin key=guid}
{if $plugin.is_active eq 'y' and $plugin.edit_field and $plugin.plugin_type eq 'format'}
- {forminput}
- <label class="radio">
+ {forminput label="radio"}
{if $numformat > 1}
<input type="radio" name="{$format_guid_variable|default:"format_guid"}" value="{$plugin.edit_field}"
{if $contentObject->mInfo.format_guid eq $plugin.plugin_guid} checked="checked"
@@ -77,7 +76,6 @@
{/if}
{/if}
{/if}
- </label>
{formhelp note=$plugin.edit_help}
{/forminput}
{/if}
@@ -96,9 +94,7 @@
<div class="form-group">
{formlabel label="Content Format"}
{forminput}
- <label>
- {$singleplugin.edit_label}
- </label>
+ {$singleplugin.edit_label}
{/forminput}
</div>
{/if}
diff --git a/templates/mime/audio/edit.tpl b/templates/mime/audio/edit.tpl
index 2df08b5..ef88d4c 100644
--- a/templates/mime/audio/edit.tpl
+++ b/templates/mime/audio/edit.tpl
@@ -36,10 +36,10 @@
{if $attachment.source_file}
<div class="form-group">
- <label class="checkbox">
+ {forminput label="checkbox"}
<input type="checkbox" id="remove_original" name="plugin[{$attachment.attachment_id}][mimeaudio][remove_original]" value="y" />Remove Original
{formhelp note="This will permanently remove the original file from the server. This will still allow you to listen to the audio file but not download it."}
- </label>
+ {/forminput}
</div>
{/if}
diff --git a/templates/mime/image/edit.tpl b/templates/mime/image/edit.tpl
index 557bdca..2085c88 100644
--- a/templates/mime/image/edit.tpl
+++ b/templates/mime/image/edit.tpl
@@ -1,10 +1,10 @@
{strip}
{if $gBitSystem->isFeatureActive( 'mime_image_panoramas' )}
<div class="form-group">
- <label class="checkbox">
+ {forminput label="checkbox"}
<input type="checkbox" value="y" name="plugin[{$attachment.attachment_id}][mimeimage][preference][is_panorama]" id="panorama" {if $attachment.thumbnail_url.panorama}checked="checked"{/if} />Panorama Image
{formhelp note="If this image is a 360&deg; panoramic image with equirectangular projection, check this box. This works best for images with a 360&deg; by 180&deg; field of view (FOV)"}
- </label>
+ {/forminput}
</div>
{/if}
{/strip}
diff --git a/templates/service_content_icon_inc.tpl b/templates/service_content_icon_inc.tpl
index b33689e..bb402f1 100644
--- a/templates/service_content_icon_inc.tpl
+++ b/templates/service_content_icon_inc.tpl
@@ -21,11 +21,5 @@
{smartlink ipackage=liberty ifile="content_permissions.php" ititle="Assign Permissions" booticon="icon-key" class=$iconClass ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id}
{/if}
{/if}
-
- {if $role_model }
- {smartlink ipackage=liberty ifile="content_role_permissions.php" ititle="Assign Permissions" booticon="icon-key" class=$iconClass ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id}
- {else}
- {smartlink ipackage=liberty ifile="content_permissions.php" ititle="Assign Permissions" booticon="icon-key" class=$iconClass ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id}
- {/if}
{/if}
{/strip}