update oembed and widgets plugins settings form

diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php
index 7e677fd6f54e097bb84e6e3ec6d373bb1c0ec376..880e4992f58000c70b6ea89c22e7015d3e0798ae 100644 (file)
--- a/addon/oembed/oembed.php
+++ b/addon/oembed/oembed.php
@@ -25,9 +25,9 @@ function oembed_uninstall() {
 function oembed_settings_post($a,$b){
     if(! local_user())
                return;
-       if (isset($_POST['oembed-submit'])){
-               set_pconfig(local_user(), 'oembed', 'use_for_youtube', (isset($_POST['oembed_use_for_youtube'])? intval($_POST['oembed_use_for_youtube']):0));
-               notice( t('OEmbed settings updated') . EOL);
+       if (x($_POST,'oembed-submit')){
+               set_pconfig(local_user(), 'oembed', 'use_for_youtube', (x($_POST,'oembed_use_for_youtube')? intval($_POST['oembed_use_for_youtube']):0));
+               info( t('OEmbed settings updated') . EOL);
        }
 }
 
@@ -36,21 +36,13 @@ function oembed_settings(&$a,&$o) {
                return;
        $uofy = intval(get_pconfig(local_user(), 'oembed', 'use_for_youtube' ));
 
-       $o.='
-       <div class="settings-block">
-       <h3 class="settings-heading">OEmbed</h3>
-       <div id="settings-username-wrapper">
-               <label for="oembed_use_for_youtube">'
-                       .t('Use OEmbed for YouTube videos: ') 
-               .'</label><input type="checkbox" id="oembed_use_for_youtube" name="oembed_use_for_youtube" value="1"'
-               . ($uofy==1?'checked="true"':'')
-               .' />
-       </div>
-       <div id="settings-username-end"></div>
-       <div class="settings-submit-wrapper">
-               <input type="submit" value="'.t('Submit').'" class="settings-submit" name="oembed-submit" />
-       </div>
-       </div>';
+       $t = file_get_contents( dirname(__file__). "/settings.tpl" );
+       $o .= replace_macros($t, array(
+               '$submit' => t('Submit'),
+               '$title' => "OEmbed",
+               '$useoembed' => array('oembed_use_for_youtube', t('Use OEmbed for YouTube videos'), $uofy, ""),
+       ));
+       
 }
 
 

diff --git a/addon/oembed/settings.tpl b/addon/oembed/settings.tpl
new file mode 100644 (file)
index 0000000..5a65ef8
--- /dev/null
+++ b/addon/oembed/settings.tpl
@@ -0,0 +1,7 @@
+<div class="settings-block">
+       <h3 class="settings-heading">$title</h3>
+       {{ inc field_checkbox.tpl with $field=$useoembed }}{{ endinc }}
+       <div class="settings-submit-wrapper">
+               <input type="submit" value="$submit" class="settings-submit" name="oembed-submit" />
+       </div>
+</div>

diff --git a/addon/widgets/settings.tpl b/addon/widgets/settings.tpl
new file mode 100644 (file)
index 0000000..9d0f21d
--- /dev/null
+++ b/addon/widgets/settings.tpl
@@ -0,0 +1,19 @@
+<div class="settings-block">
+       <h3 class="settings-heading">$title</h3>
+       <div class='field noedit'>
+               <label>$label</label>
+               <tt>$key</tt>
+       </div>
+       
+       <div class="settings-submit-wrapper">
+               <input type="submit" value="$submit" class="settings-submit" name="widgets-submit" />
+       </div>
+       
+       <h4>$widgets_h</h4>
+       <ul>
+               {{ for $widgets as $w }}
+                       <li><a href="$baseurl/widgets/$w.0/?k=$key&p=1">$w.1</a></li>
+               {{ endfor }}
+       </ul>
+       
+</div>

diff --git a/addon/widgets/widgets.php b/addon/widgets/widgets.php
index f5f8682223b91a6226f32eaf4bdf7667ad99e7b6..13c4f93bb255ec3cde2b9b93180db200bd682650 100644 (file)
--- a/addon/widgets/widgets.php
+++ b/addon/widgets/widgets.php
@@ -33,34 +33,32 @@ function widgets_settings(&$a,&$o) {
        
        $key = get_pconfig(local_user(), 'widgets', 'key' );
        if ($key=='') { $key = mt_rand(); set_pconfig(local_user(), 'widgets', 'key', $key); }
-       
-       $o .='<h3 class="settings-heading">Widgets</h3>';
-       
-       
-       $o.='
-       <div id="settings-username-wrapper">
-               '. t('Widgets key: ') .'<strong>'.$key.'</strong>
-       </div>
-       <div id="settings-username-end"></div>
-       <div class="settings-submit-wrapper">
-               <input type="submit" value="'.t('Generate new key').'" class="settings-submit" name="widgets-submit">
-       </div>';
-       
-       
-       $o.='<h4>Widgets:</h4>';
-       $o .= '<ul>';
+
+       $widgets = array();
        $d = dir(dirname(__file__));
        while(false !== ($f = $d->read())) {
                 if(substr($f,0,7)=="widget_") {
                         preg_match("|widget_([^.]+).php|", $f, $m);
                         $w=$m[1];
                         require_once($f);
-                        $o.='<li><a href="'.$a->get_baseurl().'/widgets/'.$w.'/?k='.$key.'&p=1">'. call_user_func($w."_widget_name") .'</a></li>';
+                        $widgets[] = array($w, call_user_func($w."_widget_name"));
+
                 }
        }
 
-       $o .= '</ul>';
-
+       
+       
+       $t = file_get_contents( dirname(__file__). "/settings.tpl" );
+       $o .= replace_macros($t, array(
+               '$submit' => t('Generate new key'),
+               '$baseurl' => $a->get_baseurl(),
+               '$title' => "Widgets",
+               '$label' => t('Widgets key'),
+               '$key' => $key,
+               '$widgets_h' => t('Widgets available'),
+               '$widgets' => $widgets,
+       ));
+       
 }
 
 function widgets_module() {

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index dc54398dc07e99db1018fbe4b866002e01325f66..67a1546eeda388fcc700b3c79351523b48922ba0 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2541,6 +2541,15 @@ a.mail-list-link {
        filter:alpha(opacity=100);
 }
 
+/**
+ * Plugins settings
+ */
+
+.settings-block > h3,
+.settings-heading {
+       border-bottom: 1px solid #babdb6
+}
+ 
 
 /**
  * Form fields
@@ -2554,7 +2563,6 @@ a.mail-list-link {
 .field label {
        float: left;
        width: 200px;
-       font-weight: bold;
 }
 
 .field input,
@@ -2599,7 +2607,9 @@ a.mail-list-link {
 #adminpage h3 {
        border-bottom: 1px solid #cccccc;
 }
-
+#adminpage .field label {
+       font-weight: bold;
+}
 #adminpage .submit {
        clear:left;
        text-align: right;