From: <pk...@us...> - 2009-12-09 20:53:22
|
Revision: 23780 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23780&view=rev Author: pkdille Date: 2009-12-09 20:53:10 +0000 (Wed, 09 Dec 2009) Log Message: ----------- [MOD] lesser magic: last prefs in admin freetags template Modified Paths: -------------- trunk/lib/prefs/freetags.php trunk/templates/tiki-admin-include-freetags.tpl trunk/tiki-admin_include_freetags.php Modified: trunk/lib/prefs/freetags.php =================================================================== --- trunk/lib/prefs/freetags.php 2009-12-09 20:02:59 UTC (rev 23779) +++ trunk/lib/prefs/freetags.php 2009-12-09 20:53:10 UTC (rev 23780) @@ -45,126 +45,108 @@ 'name' => tra('Lowercase tags only'), 'type' => 'flag', ), - - - // Used in templates/tiki-admin-include-freetags.tpl - 'freetags_cloud_colors' => array( - 'name' => tra('Random tag cloud colors'), - 'type' => '', - ), - - // Used in templates/tiki-admin-include-freetags.tpl 'freetags_feature_3d' => array( 'name' => tra('Enable freetags 3D browser'), - 'type' => '', + 'type' => 'flag', ), - - // Used in templates/tiki-admin-include-freetags.tpl + 'freetags_3d_autoload' => array( + 'name' => tra(''), + 'type' => 'flag', + ), 'freetags_3d_width' => array( 'name' => tra('Browser width'), - 'type' => '', + 'type' => 'text', + 'size' => '5', + 'filter' => 'digits', ), - - // Used in templates/tiki-admin-include-freetags.tpl 'freetags_3d_height' => array( 'name' => tra('Browser height'), - 'type' => '', + 'type' => 'text', + 'size' => '5', + 'filter' => 'digits', ), - - // Used in templates/tiki-admin-include-freetags.tpl 'freetags_3d_navigation_depth' => array( 'name' => tra('Navigation depth'), - 'type' => '', + 'type' => 'text', + 'size' => '3', + 'filter' => 'digits', ), - - // Used in templates/tiki-admin-include-freetags.tpl - 'freetags_3d_feed_animation_interval' => array( - 'name' => tra('Feed animation interval (milisecs)'), - 'type' => '', + 'freetags_3d_node_size' => array( + 'name' => tra('Node size'), + 'type' => 'text', + 'size' => '3', + 'filter' => 'digits', ), - - // Used in templates/tiki-admin-include-freetags.tpl + 'freetags_3d_text_size' => array( + 'name' => tra('Text size'), + 'type' => 'text', + 'size' => '3', + 'filter' => 'digits', + ), + 'freetags_3d_spring_size' => array( + 'name' => tra('Spring (connection) size'), + 'type' => 'text', + 'size' => '3', + 'filter' => 'digits', + ), 'freetags_3d_existing_page_color' => array( - 'name' => tra('Node color'), - 'type' => '', + 'name' => tra('Existing page node color'), + 'type' => 'text', + 'size' => '10', ), - - // Used in templates/tiki-admin-include-freetags.tpl 'freetags_3d_missing_page_color' => array( - 'name' => '', - 'type' => '', + 'name' => tra('Missing page node color'), + 'type' => 'text', + 'size' => '10', ), - - // Used in templates/tiki-admin-include-freetags.tpl - 'freetags_3d_autoload' => array( - 'name' => '', - 'type' => '', + 'freetags_3d_adjust_camera' => array( + 'name' => tra('Camera distance adjusted relative to nearest node'), + 'type' => 'flag', ), - - // Used in templates/tiki-admin-include-freetags.tpl 'freetags_3d_camera_distance' => array( 'name' => tra('Camera distance'), - 'type' => '', + 'type' => 'text', + 'size' => '5', + 'filter' => 'digits', ), - - // Used in templates/tiki-admin-include-freetags.tpl - 'freetags_3d_elastic_constant' => array( - 'name' => tra('Elastic constant'), - 'type' => '', - ), - - // Used in templates/tiki-admin-include-freetags.tpl - 'freetags_3d_eletrostatic_constant' => array( - 'name' => tra('Eletrostatic constant'), - 'type' => '', - ), - - // Used in templates/tiki-admin-include-freetags.tpl 'freetags_3d_fov' => array( 'name' => tra('Field of view'), - 'type' => '', + 'type' => 'text', + 'size' => '5', + 'filter' => 'digits', ), - - // Used in templates/tiki-admin-include-freetags.tpl + 'freetags_3d_feed_animation_interval' => array( + 'name' => tra('Feed animation interval (milisecs)'), + 'type' => 'text', + 'size' => '5', + 'filter' => 'digits', + ), 'freetags_3d_friction_constant' => array( 'name' => tra('Friction constant'), - 'type' => '', + 'type' => 'text', + 'size' => '5', ), - - // Used in templates/tiki-admin-include-freetags.tpl - 'freetags_3d_node_charge' => array( - 'name' => tra('Node charge'), - 'type' => '', + 'freetags_3d_elastic_constant' => array( + 'name' => tra('Elastic constant'), + 'type' => 'text', + 'size' => '5', ), - - // Used in templates/tiki-admin-include-freetags.tpl + 'freetags_3d_eletrostatic_constant' => array( + 'name' => tra('Eletrostatic constant'), + 'type' => 'text', + 'size' => '5', + ), 'freetags_3d_node_mass' => array( 'name' => tra('Node mass'), - 'type' => '', + 'type' => 'text', + 'size' => '5', + 'filter' => 'digits', ), - - // Used in templates/tiki-admin-include-freetags.tpl - 'freetags_3d_node_size' => array( - 'name' => tra('Node size'), - 'type' => '', + 'freetags_3d_node_charge' => array( + 'name' => tra('Node charge'), + 'type' => 'text', + 'size' => '5', + 'filter' => 'digits', ), - - // Used in templates/tiki-admin-include-freetags.tpl - 'freetags_3d_spring_size' => array( - 'name' => tra('Spring (connection) size'), - 'type' => '', - ), - - // Used in templates/tiki-admin-include-freetags.tpl - 'freetags_3d_text_size' => array( - 'name' => tra('Text size'), - 'type' => '', - ), - - // Used in templates/tiki-admin-include-freetags.tpl - 'freetags_3d_adjust_camera' => array( - 'name' => tra('Camera distance adjusted relative to nearest node'), - 'type' => '', - ), ); } Modified: trunk/templates/tiki-admin-include-freetags.tpl =================================================================== --- trunk/templates/tiki-admin-include-freetags.tpl 2009-12-09 20:02:59 UTC (rev 23779) +++ trunk/templates/tiki-admin-include-freetags.tpl 2009-12-09 20:53:10 UTC (rev 23780) @@ -1,190 +1,95 @@ <form action="tiki-admin.php?page=freetags" method="post"> - <div class="heading input_submit_container" style="text-align: right"> - <input type="submit" value="{tr}Change preferences{/tr}" /> - </div> - {tabset name="admin_freetags"} - {tab name="{tr}General Settings{/tr}"} - <fieldset> - <legend>{tr}Freetags{/tr}{if $prefs.feature_help eq 'y'} {help url="Tags"}{/if}</legend> - <input type="hidden" name="freetagsfeatures" /> - {preference name=freetags_browse_show_cloud} + <div class="heading input_submit_container" style="text-align: right"> + <input type="submit" value="{tr}Change preferences{/tr}" /> + </div> + {tabset name="admin_freetags"} + {tab name="{tr}General Settings{/tr}"} + <fieldset> + <legend>{tr}Freetags{/tr}{if $prefs.feature_help eq 'y'} {help url="Tags"}{/if}</legend> + <input type="hidden" name="freetagsfeatures" /> + {preference name=freetags_browse_show_cloud} - <div class="adminoptionboxchild" id="freetags_browse_show_cloud_childcontainer"> - {preference name=freetags_browse_amount_tags_in_cloud} - </div> + <div class="adminoptionboxchild" id="freetags_browse_show_cloud_childcontainer"> + {preference name=freetags_browse_amount_tags_in_cloud} + </div> - {preference name=freetags_show_middle} - {preference name=freetags_preload_random_search} - <em>{tr}When arriving on <a href="tiki-browse_freetags.php">freetag search page</a>{/tr}.</em> + {preference name=freetags_show_middle} + {preference name=freetags_preload_random_search} + <em>{tr}When arriving on <a href="tiki-browse_freetags.php">freetag search page</a>{/tr}.</em> - - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_cloud_colors">{tr}Random tag cloud colors{/tr}:</label> - <input type="text" name="freetags_cloud_colors" id="freetags_cloud_colors" value="{foreach from=$prefs.freetags_cloud_colors item=color name=colors}{$color}{if !$smarty.foreach.colors.last},{/if}{/foreach}" /> - <br /> - <em>{tr}Separate colors with a comma (,){/tr}.</em> - </div> - </div> - - {preference name=freetags_browse_amount_tags_suggestion} - {preference name=freetags_normalized_valid_chars} - <div class="adminoptionboxchild"> - <a class="button" href='#Browsing' onclick="document.getElementById('freetags_normalized_valid_chars').value='a-zA-Z0-9';">{tr}Alphanumeric ASCII characters only{/tr}</a> - ({tr}No accents or special characters{/tr}.) + <div class="adminoptionbox"> + <div class="adminoptionlabel"> + <label for="freetags_cloud_colors">{tr}Random tag cloud colors{/tr}:</label> + <input type="text" name="freetags_cloud_colors" id="freetags_cloud_colors" value="{foreach from=$prefs.freetags_cloud_colors item=color name=colors}{$color}{if !$smarty.foreach.colors.last},{/if}{/foreach}" /> <br /> - <a class="button" href='#Browsing' onclick="document.getElementById('freetags_normalized_valid_chars').value='';">{tr}Accept all charactrs{/tr}</a> + <em>{tr}Separate colors with a comma (,){/tr}.</em> </div> - {preference name=freetags_lowercase_only} - {preference name=freetags_multilingual} - {preference name=morelikethis_algorithm} - {preference name=morelikethis_basic_mincommon} - </fieldset> + </div> - <fieldset> - <legend>{tr}Tag Management{/tr}</legend> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <div align="center"> - <input type="submit" value="{tr}Cleanup unused tags{/tr}" name="cleanup" /> - </div> - </div> - </div> - </fieldset> - {/tab} + {preference name=freetags_browse_amount_tags_suggestion} + {preference name=freetags_normalized_valid_chars} + <div class="adminoptionboxchild"> + <a class="button" href='#Browsing' onclick="document.getElementById('freetags_normalized_valid_chars').value='a-zA-Z0-9';">{tr}Alphanumeric ASCII characters only{/tr}</a> + ({tr}No accents or special characters{/tr}.) + <br /> + <a class="button" href='#Browsing' onclick="document.getElementById('freetags_normalized_valid_chars').value='';">{tr}Accept all charactrs{/tr}</a> + </div> + {preference name=freetags_lowercase_only} + {preference name=freetags_multilingual} + {preference name=morelikethis_algorithm} + {preference name=morelikethis_basic_mincommon} + </fieldset> - {tab name="{tr}3D Tag Browser{/tr}"} - <input type="hidden" name="freetagsset3d" /> - {if $prefs.feature_morcego ne "y"} - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - {icon _id=information} {tr}Morcego 3D browser disabled{/tr}. <a href=" tiki-admin.php?page=features" title="features">{tr}Enable now{/tr}</a>. + <fieldset> + <legend>{tr}Tag Management{/tr}</legend> + <div class="adminoptionbox"> + <div class="adminoptionlabel"> + <div align="center"> + <input type="submit" value="{tr}Cleanup unused tags{/tr}" name="cleanup" /> </div> </div> - {else} - <div class="adminoptionbox"> - <div class="adminoption"> - <input type="checkbox" id="freetags_feature_3d" name="freetags_feature_3d" {if $prefs.freetags_feature_3d eq 'y'}checked="checked" {/if}onclick="flip('use3d');" /> - </div> - <div class="adminoptionlabel"> - <label for="freetags_feature_3d">{tr}Enable freetags 3D browser{/tr}</label> - </div> - </div> - <br /> - {/if} - <div id="use3d" style="display:{if $prefs.freetags_feature_3d eq 'y'}block{else}none{/if};"> + </div> + </fieldset> + {/tab} + + {if $prefs.feature_morcego eq 'y'} + {tab name="{tr}3D Tag Browser Configuration{/tr}"} + {preference name=freetags_feature_3d} + <div id=freetags_feature_3d_childcontainer> <fieldset> <legend>{tr}General{/tr}</legend> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_width">{tr}Browser width{/tr}:</label> - <input type="text" name="freetags_3d_width" id="freetags_3d_width" value="{$prefs.freetags_3d_width|escape}" size="3" /> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_height">{tr}Browser height{/tr}: </label> - <input type="text" name="freetags_3d_height" id="freetags_3d_height" value="{$prefs.freetags_3d_height|escape}" size="3" /> - </div> - </div> + {preference name=freetags_3d_width} + {preference name=freetags_3d_height} </fieldset> - <fieldset> + <fieldset> <legend>{tr}Graph appearance{/tr}</legend> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_navigation_depth">{tr}Navigation depth{/tr}: <input type="text" name="freetags_3d_navigation_depth" id="freetags_3d_navigation_depth" value="{$prefs.freetags_3d_navigation_depth|escape}" size="2" /></label> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_node_size">{tr}Node size{/tr}: </label> - <input type="text" name="freetags_3d_node_size" id="freetags_3d_node_size" value="{$prefs.freetags_3d_node_size}" size="2" /> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_text_size">{tr}Text size{/tr}: </label> - <input type="text" name="freetags_3d_text_size" id="freetags_3d_text_size" value="{$prefs.freetags_3d_text_size}" size="3" /> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_spring_size">{tr}Spring (connection) size{/tr}: <input type="text" name="freetags_3d_spring_size" id="freetags_3d_spring_size" value="{$prefs.freetags_3d_spring_size}" size="3" /></label> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_existing_page_color">{tr}Node color{/tr}: <input type="text" name="freetags_3d_existing_page_color" id="freetags_3d_existing_page_color" value="{$prefs.freetags_3d_existing_page_color|escape}" size="7" /></label> - </div> - </div> + {preference name=freetags_3d_navigation_depth} + {preference name=freetags_3d_node_size} + {preference name=freetags_3d_text_size} + {preference name=freetags_3d_spring_size} + {preference name=freetags_3d_existing_page_color} + {preference name=freetags_3d_missing_page_color} </fieldset> - <fieldset> - <legend>{tr}Camera settinsg{/tr}</legend> - <div class="adminoptionbox"> - <div class="adminoption"> - <input type="checkbox" id="freetags_3d_adjust_camera" name="freetags_3d_adjust_camera" {if $prefs.freetags_3d_adjust_camera eq 'true'}checked="checked"{/if} /> - </div> - <div class="adminoptionlabel"> - <label for="freetags_3d_adjust_camera">{tr}Camera distance adjusted relative to nearest node{/tr}.</label> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_camera_distance">{tr}Camera distance{/tr}: </label> - <input type="text" name="freetags_3d_camera_distance" id="freetags_3d_camera_distance" value="{$prefs.freetags_3d_camera_distance}" size="3" /> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_fov">{tr}Field of view{/tr}: </label> - <input type="text" name="freetags_3d_fov" id="freetags_3d_fov" value="{$prefs.freetags_3d_fov}" size="3" /> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_feed_animation_interval">{tr}Feed animation interval (milisecs){/tr}: <input type="text" id="freetags_3d_feed_animation_interval" name="freetags_3d_feed_animation_interval" value="{$prefs.freetags_3d_feed_animation_interval|escape}" size="4" /></label> - </div> - </div> + <legend>{tr}Camera settings{/tr}</legend> + {preference name=freetags_3d_adjust_camera} + {preference name=freetags_3d_camera_distance} + {preference name=freetags_3d_fov} + {preference name=freetags_3d_feed_animation_interval} </fieldset> - <fieldset> <legend>{tr}Physics engine{/tr}</legend> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_friction_constant">{tr}Friction constant{/tr}:</label> - <input type="text" name="freetags_3d_friction_constant" id="freetags_3d_friction_constant" value="{$prefs.freetags_3d_friction_constant}" size="7" /> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_elastic_constant">{tr}Elastic constant{/tr}: </label> - <input type="text" name="freetags_3d_elastic_constant" id="freetags_3d_elastic_constant" value="{$prefs.freetags_3d_elastic_constant}" size="7" /> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_eletrostatic_constant">{tr}Eletrostatic constant{/tr}: </label> - <input type="text" name="freetags_3d_eletrostatic_constant" id="freetags_3d_eletrostatic_constant" value="{$prefs.freetags_3d_eletrostatic_constant}" size="7" /> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_node_mass">{tr}Node mass{/tr}: </label> - <input type="text" name="freetags_3d_node_mass" id="freetags_3d_node_mass" value="{$prefs.freetags_3d_node_mass}" size="7" /> - </div> - </div> - <div class="adminoptionbox"> - <div class="adminoptionlabel"> - <label for="freetags_3d_node_charge">{tr}Node charge{/tr}: </label> - <input type="text" name="freetags_3d_node_charge" id="freetags_3d_node_charge" value="{$prefs.freetags_3d_node_charge}" size="7" /> - </div> - </div> + {preference name=freetags_3d_friction_constant} + {preference name=freetags_3d_elastic_constant} + {preference name=freetags_3d_eletrostatic_constant} + {preference name=freetags_3d_node_mass} + {preference name=freetags_3d_node_charge} </fieldset> </div> {/tab} - {/tabset} - <div class="heading input_submit_container" style="text-align: center"> - <input type="submit" value="{tr}Change preferences{/tr}" /> - </div> + {/if} + {/tabset} + <div class="heading input_submit_container" style="text-align: center"> + <input type="submit" value="{tr}Change preferences{/tr}" /> + </div> </form> Modified: trunk/tiki-admin_include_freetags.php =================================================================== --- trunk/tiki-admin_include_freetags.php 2009-12-09 20:02:59 UTC (rev 23779) +++ trunk/tiki-admin_include_freetags.php 2009-12-09 20:53:10 UTC (rev 23780) @@ -3,22 +3,15 @@ // // 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_freetags.php,v 1.9.2.5 2008-02-18 14:03:29 lphuberdeau Exp $ -//this script may only be included - so its better to die if called directly. -//smarty is not there - we need setup + +// This script may only be included - so its better to die if called directly. + require_once ('tiki-setup.php'); $access->check_script($_SERVER["SCRIPT_NAME"], basename(__FILE__)); if (isset($_REQUEST["freetagsfeatures"])) { check_ticket('admin-inc-freetags'); - simple_set_toggle('freetags_browse_show_cloud'); - simple_set_toggle('freetags_lowercase_only'); - simple_set_toggle('freetags_preload_random_search'); - simple_set_value('freetags_browse_amount_tags_in_cloud'); - simple_set_value('freetags_browse_amount_tags_suggestion'); - simple_set_value('freetags_normalized_valid_chars'); - simple_set_value('freetags_cloud_colors'); - simple_set_toggle('freetags_show_middle'); } + if (isset($_REQUEST["cleanup"])) { check_ticket('admin-inc-freetags'); global $freetaglib; @@ -27,47 +20,14 @@ } $freetaglib->cleanup_tags(); } + if (isset($_REQUEST["morelikethisoptions"])) { check_ticket('admin-inc-freetags'); - simple_set_value('morelikethis_algorithm'); - simple_set_value('morelikethis_basic_mincommon'); } + if (isset($_REQUEST["freetagsset3d"])) { check_ticket('admin-inc-freetags'); - $pref_toggles = array( - 'freetags_feature_3d', - 'freetags_feature_3d', - ); - foreach($pref_toggles as $toggle) { - simple_set_toggle($toggle); - } - $pref_values = array( - 'freetags_3d_width', - 'freetags_3d_height', - 'freetags_3d_navigation_depth', - 'freetags_3d_feed_animation_interval', - 'freetags_3d_existing_page_color', - 'freetags_3d_missing_page_color', - 'freetags_3d_autoload', - 'freetags_3d_camera_distance', - 'freetags_3d_fov', - 'freetags_3d_node_size', - 'freetags_3d_text_size', - 'freetags_3d_friction_constant', - 'freetags_3d_elastic_constant', - 'freetags_3d_eletrostatic_constant', - 'freetags_3d_spring_size', - 'freetags_3d_node_mass', - 'freetags_3d_node_charge' - ); - foreach($pref_values as $value) { - simple_set_value($value); - } - if (isset($_REQUEST["freetags_3d_adjust_camera"]) && $_REQUEST["freetags_3d_adjust_camera"] == "on") { - $tikilib->set_preference("freetags_3d_adjust_camera", 'true'); - } else { - $tikilib->set_preference("freetags_3d_adjust_camera", 'false'); - } } + $headerlib->add_cssfile('css/admin.css'); ask_ticket('admin-inc-freetags'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |