Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[21963] trunk
|
From: <pk...@us...> - 2009-10-02 23:03:54
|
Revision: 21963
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21963&view=rev
Author: pkdille
Date: 2009-10-02 23:03:42 +0000 (Fri, 02 Oct 2009)
Log Message:
-----------
[MOD] lesser magic deployment to copyright admin grid
Modified Paths:
--------------
trunk/lib/prefs/global.php
trunk/lib/prefs/wiki.php
trunk/templates/tiki-admin-include-copyright.tpl
trunk/tiki-admin_include_copyright.php
Added Paths:
-----------
trunk/lib/prefs/articles.php
trunk/lib/prefs/blogues.php
trunk/lib/prefs/faqs.php
Added: trunk/lib/prefs/articles.php
===================================================================
--- trunk/lib/prefs/articles.php (rev 0)
+++ trunk/lib/prefs/articles.php 2009-10-02 23:03:42 UTC (rev 21963)
@@ -0,0 +1,13 @@
+<?php
+
+function prefs_articles_list() {
+ return array(
+ 'articles_feature_copyrights' => array(
+ 'name' => tra('Articles'),
+ 'type' => 'flag',
+ 'dependencies' => array(
+ 'feature_articles',
+ ),
+ ),
+ );
+}
Added: trunk/lib/prefs/blogues.php
===================================================================
--- trunk/lib/prefs/blogues.php (rev 0)
+++ trunk/lib/prefs/blogues.php 2009-10-02 23:03:42 UTC (rev 21963)
@@ -0,0 +1,13 @@
+<?php
+
+function prefs_blogues_list() {
+ return array(
+ 'blogues_feature_copyrights' => array(
+ 'name' => tra('Blogues'),
+ 'type' => 'flag',
+ 'dependencies' => array(
+ 'feature_blogs',
+ ),
+ ),
+ );
+}
Added: trunk/lib/prefs/faqs.php
===================================================================
--- trunk/lib/prefs/faqs.php (rev 0)
+++ trunk/lib/prefs/faqs.php 2009-10-02 23:03:42 UTC (rev 21963)
@@ -0,0 +1,13 @@
+<?php
+
+function prefs_faqs_list() {
+ return array(
+ 'faqs_feature_copyrights' => array(
+ 'name' => tra('Faqs'),
+ 'type' => 'flag',
+ 'dependencies' => array(
+ 'feature_faqs',
+ ),
+ ),
+ );
+}
Modified: trunk/lib/prefs/global.php
===================================================================
--- trunk/lib/prefs/global.php 2009-10-02 22:00:09 UTC (rev 21962)
+++ trunk/lib/prefs/global.php 2009-10-02 23:03:42 UTC (rev 21963)
@@ -82,5 +82,15 @@
'name' => tra('Open external links in new window'),
'type' => 'flag',
),
+ 'wikiLicensePage' => array(
+ 'name' => tra('License page'),
+ 'type' => 'text',
+ 'size' => '30',
+ ),
+ 'wikiSubmitNotice' => array(
+ 'name' => tra('Submit notice'),
+ 'type' => 'text',
+ 'size' => '30',
+ ),
);
}
Modified: trunk/lib/prefs/wiki.php
===================================================================
--- trunk/lib/prefs/wiki.php 2009-10-02 22:00:09 UTC (rev 21962)
+++ trunk/lib/prefs/wiki.php 2009-10-02 23:03:42 UTC (rev 21963)
@@ -87,7 +87,12 @@
7200 => '2 ' . tra('hours'),
),
),
+ 'wiki_feature_copyrights' => array(
+ 'name' => tra('Wiki'),
+ 'type' => 'flag',
+ 'dependencies' => array(
+ 'feature_wiki',
+ ),
+ ),
);
}
-
-?>
Modified: trunk/templates/tiki-admin-include-copyright.tpl
===================================================================
--- trunk/templates/tiki-admin-include-copyright.tpl 2009-10-02 22:00:09 UTC (rev 21962)
+++ trunk/templates/tiki-admin-include-copyright.tpl 2009-10-02 23:03:42 UTC (rev 21963)
@@ -3,60 +3,29 @@
{remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Copyright allows to determine a copyright for all the objects of tikiwiki{/tr}.{/remarksbox}
<form action="tiki-admin.php?page=copyright" method="post">
-<div class="input_submit_container clear" style="text-align: right;">
- <input type="submit" value="{tr}Change preferences{/tr}" />
-</div>
-<input type="hidden" name="setcopyright" />
-
-<fieldset><legend>{tr}Copyright management{/tr}</legend>
-
-<div class="adminoptionbox">
- <div class="adminoptionlabel"><label for="wikiLicensePage">{tr}License page{/tr}: </label> <input type="text" name="wikiLicensePage" id="wikiLicensePage" value="{$prefs.wikiLicensePage|escape}" /></div>
-</div>
-<div class="adminoptionbox">
- <div class="adminoptionlabel"><label for="wikiSubmitNotice">{tr}Submit notice{/tr}:</label> <input type="text" name="wikiSubmitNotice" id="wikiSubmitNotice" value="{$prefs.wikiSubmitNotice|escape}" /></div>
-</div>
-
-<div class="adminoptionbox">
- <div class="adminoptionlabel">{tr}Enable copyright management for{/tr}:</div>
-<div class="adminoptionboxchild">
-<div class="adminoptionbox">
- <div class="adminoption"><input type="checkbox" id="wiki_feature_copyrights" name="wiki_feature_copyrights" {if $prefs.wiki_feature_copyrights eq 'y'}checked="checked"{/if}/></div>
- <div class="adminoptionlabel"><label for="wiki_feature_copyrights">{tr}Wiki{/tr}</label>
- {if $prefs.feature_wiki ne'y'}{icon _id=information} {tr}Feature disabled{/tr}. <a href="tiki-admin.php?page=features" title="{tr}Feature{/tr}">{tr}Enable now{/tr}</a>.{/if}
+ <div class="input_submit_container clear" style="text-align: right;">
+ <input type="submit" value="{tr}Change preferences{/tr}" />
</div>
-</div>
-<div class="adminoptionbox">
- <div class="adminoption"><input type="checkbox" id="articles_feature_copyrights" name="articles_feature_copyrights" {if $prefs.articles_feature_copyrights eq 'y'}checked="checked"{/if}/></div>
- <div class="adminoptionlabel"><label for="articles_feature_copyrights">{tr}Articles{/tr}</label>
- {if $prefs.feature_articles ne 'y'}{icon _id=information} {tr}Feature disabled{/tr}. <a href="tiki-admin.php?page=features" title="{tr}Feature{/tr}">{tr}Enable now{/tr}</a>.{/if}
- </div>
-</div>
-<div class="adminoptionbox">
- <div class="adminoption"><input type="checkbox" id="blogues_feature_copyrights" name="blogues_feature_copyrights" {if $prefs.blogues_feature_copyrights eq 'y'}checked="checked"{/if}/></div>
- <div class="adminoptionlabel"><label for="blogues_feature_copyrights">{tr}Blogs{/tr}</label>
- {if $prefs.feature_blogs ne 'y'}{icon _id=information} {tr}Feature disabled{/tr}. <a href="tiki-admin.php?page=features" title="{tr}Feature{/tr}">{tr}Enable now{/tr}</a>.{/if}
- </div>
-</div>
-<div class="adminoptionbox">
- <div class="adminoption"><input type="checkbox" id="faqs_feature_copyrights" name="faqs_feature_copyrights" {if $prefs.faqs_feature_copyrights eq 'y'}checked="checked"{/if}/></div>
- <div class="adminoptionlabel"><label for="faqs_feature_copyrights">FAQs</label>
- {if $prefs.feature_faqs ne 'y'}{icon _id=information} {tr}Feature disabled{/tr}. <a href="tiki-admin.php?page=features" title="{tr}Feature{/tr}">{tr}Enable now{/tr}</a>.{/if}
- </div>
-</div>
-</div>
-</div>
+ <input type="hidden" name="setcopyright" />
-</fieldset>
+ <fieldset>
+ <legend>{tr}Copyright management{/tr}</legend>
+ {preference name=wikiLicensePage}
+ {preference name=wikiSubmitNotice}
+ <div class="adminoptionbox">
+ <div class="adminoptionlabel">{tr}Enable copyright management for{/tr}:</div>
+ <div class="adminoptionboxchild">
+ {preference name=wiki_feature_copyrights}
+ {preference name=articles_feature_copyrights}
+ {preference name=blogues_feature_copyrights}
+ {preference name=faqs_feature_copyrights}
-<div class="input_submit_container clear" style="text-align: center;">
- <input type="submit" value="{tr}Change preferences{/tr}" />
-</div>
-</form>
+ </div>
+ </div>
+ </fieldset>
-
-<div class="adminoptionbox">
- <div class="adminoption"></div>
- <div class="adminoptionlabel"><label for=""></label></div>
-</div>
+ <div class="input_submit_container clear" style="text-align: center;">
+ <input type="submit" value="{tr}Change preferences{/tr}" />
+ </div>
+</form>
Modified: trunk/tiki-admin_include_copyright.php
===================================================================
--- trunk/tiki-admin_include_copyright.php 2009-10-02 22:00:09 UTC (rev 21962)
+++ trunk/tiki-admin_include_copyright.php 2009-10-02 23:03:42 UTC (rev 21963)
@@ -3,7 +3,7 @@
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
-// $Id: /cvsroot/tikiwiki/tiki/tiki-admin_include_copyright.php,v 1.4.2.1 2007-11-04 22:08:04 nyloth Exp $
+
//this script may only be included - so its better to die if called directly.
if (strpos($_SERVER["SCRIPT_NAME"], basename(__FILE__)) !== false) {
header("location: index.php");
@@ -11,17 +11,5 @@
}
if (isset($_REQUEST["setcopyright"])) {
check_ticket('admin-inc-copyright');
- $pref_toggles = array(
- "wiki_feature_copyrights",
- "blogues_feature_copyrights",
- "faqs_feature_copyrights",
- "articles_feature_copyrights",
- );
- $pref_byref_values = array(
- "wikiLicensePage",
- "wikiSubmitNotice",
- );
- foreach($pref_toggles as $toggle) simple_set_toggle($toggle);
- foreach($pref_byref_values as $value) byref_set_value($value);
}
ask_ticket('admin-inc-copyright');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|