[Openupload-svn-update] SF.net SVN: openupload:[177] trunk

[<ts...@us...>]

Revision: 177
          http://openupload.svn.sourceforge.net/openupload/?rev=177&view=rev
Author:   tsdogs
Date:     2008-12-09 19:04:28 +0000 (Tue, 09 Dec 2008)

Log Message:
-----------
fix display issues

Modified Paths:
--------------
    trunk/CHANGELOG
    trunk/TODO
    trunk/lib/modules/default/admin.inc.php
    trunk/plugins/mimetypes.inc.php
    trunk/templates/default/index.tpl
    trunk/templates/default/modules/admin/logs.tpl
    trunk/www/templates/default/main.css

Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2008-12-09 18:11:44 UTC (rev 176)
+++ trunk/CHANGELOG	2008-12-09 19:04:28 UTC (rev 177)
@@ -17,12 +17,16 @@
   - Plugin options
   - Enabled confirmation on record deletion
   - Enabled multi delete option
+  - Enabled option configuration page
 
+* Setup
+  - A setup script which should simplify first time configuration.
+
 * Logs
   - Createed logs which can be used for statistics.
 
 * Upload
-- Display upload progress, requires either uploadprogress / apc pecl extensions
+  - Display upload progress, requires either uploadprogress / apc pecl extensions
 
 * Plugins
   - Options are now group based and in the database

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2008-12-09 18:11:44 UTC (rev 176)
+++ trunk/TODO	2008-12-09 19:04:28 UTC (rev 177)
@@ -16,11 +16,8 @@
 - Create a script to clean up the files/tmpfiles.
 
 Setup
-- Add setup script (almost ready)
 - Check for something I don't remember right now :/
 
-Administration
-- Config administration
 
 ******* OTHER THINGS/IDEAS *******
 

Modified: trunk/lib/modules/default/admin.inc.php
===================================================================
--- trunk/lib/modules/default/admin.inc.php	2008-12-09 18:11:44 UTC (rev 176)
+++ trunk/lib/modules/default/admin.inc.php	2008-12-09 19:04:28 UTC (rev 177)
@@ -546,6 +546,8 @@
       $groups = app()->auth->groupinfo();
       $options = app()->db->read('plugin_options',array('plugin' => $_GET['id']),array('group_name'),
                                   '',array('group_name','name'));
+      $x = '['.tr('Any').']';
+      $groups[]= array ('name' => '*', 'description' => $x);
       $this->tpl->assign('groups',$groups);
       $this->tpl->assign('plugin_options',$options);
       $this->tpl->assign('options',app()->plugins[$_GET['id']]->options);
@@ -564,6 +566,8 @@
       $plugin = isset($_POST['id'])?$_POST['id']:$_GET['id'];
       $poptions = app()->plugins[$plugin]->options;
       $groups = app()->auth->groupinfo();
+      $x = '['.tr('Any').']';
+      $groups[]= array ('name' => '*', 'description' => $x);
       $this->tpl->assign('groups',$groups);
       $this->tpl->assign('options',$poptions);
       $this->tpl->assign('pluginname',$plugin);

Modified: trunk/plugins/mimetypes.inc.php
===================================================================
--- trunk/plugins/mimetypes.inc.php	2008-12-09 18:11:44 UTC (rev 176)
+++ trunk/plugins/mimetypes.inc.php	2008-12-09 19:04:28 UTC (rev 177)
@@ -31,6 +31,10 @@
   function uploadForm(&$finfo,$acl) {
     if ($acl!='enable') return true;
     $group = $this->getGroup();
+    if (count($this->config['allowed'][$group])==0 and count($this->config['allowed']['*'])>0) {
+      $this->config['allowed'][$group]=$this->config['allowed']['*'];
+      $this->config['message'][$group]=$this->config['message']['*'];
+    }
     if (count($this->config['allowed'][$group])==0) {
       app()->error(tr('WARNING: no mime types defined. Plugin has been disabled!'));
     } else {
@@ -44,6 +48,10 @@
   function uploadComplete(&$finfo,$acl) {
     if ($acl!='enable') return true;
     $group = $this->getGroup();
+    if (count($this->config['allowed'][$group])==0 and count($this->config['allowed']['*'])>0) {
+      $this->config['allowed'][$group]=$this->config['allowed']['*'];
+      $this->config['message'][$group]=$this->config['message']['*'];
+    }
     if (count($this->config['allowed'][$group])==0) {
       app()->error(tr('WARNING: no mime types defined. Plugin has been disabled!'));
     } else {

Modified: trunk/templates/default/index.tpl
===================================================================
--- trunk/templates/default/index.tpl	2008-12-09 18:11:44 UTC (rev 176)
+++ trunk/templates/default/index.tpl	2008-12-09 19:04:28 UTC (rev 177)
@@ -31,17 +31,17 @@
 </div> <!-- header end -->
 <!-- menu -->
 <!-- content -->
-<div id="wrapper">
-<div id="content" align="center">
+<div id="wrapper"><br>
 {foreach from=$user.messages item=m}
 <div id="message">{$m}</div>
 {/foreach}
 {foreach from=$user.errors item=e}
 <div id="error">{$e}</div>
 {/foreach}
+<div id="content" align="center">
 {$page.content}
 </div> <!-- content end -->
-</div>
+</div> <!-- wrapper -->
 <br>&nbsp;<br>
 <!-- footer -->
 <div id="footer">{$site.footer}</div>

Modified: trunk/templates/default/modules/admin/logs.tpl
===================================================================
--- trunk/templates/default/modules/admin/logs.tpl	2008-12-09 18:11:44 UTC (rev 176)
+++ trunk/templates/default/modules/admin/logs.tpl	2008-12-09 19:04:28 UTC (rev 177)
@@ -14,6 +14,7 @@
 <option value="info" {if $level=="info"}selected{/if}>{tr}Info{/tr}</option>
 </select>
 </form>
+</div>
 {if $pages>2}
 <center>{section name=page loop=$pages start=1 max=20}
 {if $pagen==$smarty.section.page.index}

Modified: trunk/www/templates/default/main.css
===================================================================
--- trunk/www/templates/default/main.css	2008-12-09 18:11:44 UTC (rev 176)
+++ trunk/www/templates/default/main.css	2008-12-09 19:04:28 UTC (rev 177)
@@ -3,6 +3,7 @@
   font-size: 10pt;
   margin: auto;
   text-align: center;
+  background-color: #fdfdfd;
 }
 #logo {
   float:left;
@@ -193,6 +194,7 @@
   vertical-align: middle;
 }
 #message {
+  clear: both;
   text-align: left;
 }
 #error {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.