Changeset 790 for trunk/phpgwapi

Timestamp:

05/05/09 15:52:22 (15 years ago)

Author:

niltonneto

Message:

Ticket #475 - Modificação para tornar flexível a utilização de múltiplos templates.

Location:

trunk/phpgwapi

Files:

• inc/class.common.inc.php (modified) (1 diff)
• inc/functions.inc.php (modified) (1 diff)
• js/dftree/dftree.css (modified) (2 diffs)
• js/dftree/dftree.js (modified) (3 diffs)
• templates/celepar/head.inc.php (modified) (1 diff)
• templates/celepar/images/critic.png (copied) (copied from sandbox/expresso/preparacao_novos_templates/phpgwapi/templates/celepar/images/critic.png)
• templates/celepar/images/foldertree_draft.png (copied) (copied from sandbox/expresso/preparacao_novos_templates/phpgwapi/templates/celepar/images/foldertree_draft.png)
• templates/celepar/images/foldertree_sent.png (copied) (copied from sandbox/expresso/preparacao_novos_templates/phpgwapi/templates/celepar/images/foldertree_sent.png)
• templates/celepar/images/foldertree_spam.png (copied) (copied from sandbox/expresso/preparacao_novos_templates/phpgwapi/templates/celepar/images/foldertree_spam.png)
• templates/celepar/images/foldertree_trash.png (copied) (copied from sandbox/expresso/preparacao_novos_templates/phpgwapi/templates/celepar/images/foldertree_trash.png)
• templates/celepar/images/help.png (copied) (copied from sandbox/expresso/preparacao_novos_templates/phpgwapi/templates/celepar/images/help.png)
• templates/celepar/images/login_box.png (copied) (copied from sandbox/expresso/preparacao_novos_templates/phpgwapi/templates/celepar/images/login_box.png)
• templates/celepar/images/login_expresso.png (copied) (copied from sandbox/expresso/preparacao_novos_templates/phpgwapi/templates/celepar/images/login_expresso.png)
• templates/celepar/images/logout.png (modified) (previous)
• templates/celepar/navbar.inc.php (modified) (1 diff)

trunk/phpgwapi/inc/class.common.inc.php

@@ -736 +736 @@
                         while ($entry=$d->read())
                         {
-                                if ($entry != 'CVS' && $entry != '.' && $entry != '..'
-                                        && $entry != 'phpgw_website'
-                                        && is_dir(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry))
-                                {
+                                if ($entry != '.' && $entry != '..' && is_dir(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry) && file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/head.inc.php'))
+                                {
+                                        $list[$entry]['title'] = $entry;
                                         $list[$entry]['name'] = $entry;
+
                                         $f = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/details.inc.php';
                                         if (file_exists ($f))
                                         {
                                                 include($f);
-                                                $list[$entry]['title'] = 'Use '.$GLOBALS['phpgw_info']['template'][$entry]['title'].'interface';
-                                        }
-                                        else
-                                        {
-                                                $list[$entry]['title'] = $entry;
+                                                if ( defined( $entry.'_TEMPLATE_TITLE' ) )
+                                                        $list[$entry]['title'] = utf8_decode( constant($entry.'_TEMPLATE_TITLE') );
                                         }
                                 }

trunk/phpgwapi/inc/functions.inc.php

@@ -385 +385 @@
                 {
                         $GLOBALS['phpgw']->template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+                        preg_match('/(.*)\/(.*)/', PHPGW_APP_TPL, $matches);
+
+                        if ($GLOBALS['phpgw_info']['flags']['currentapp'] != "jabberit_messenger")
+                        $_SESSION['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']]['user']['preferences']['common']['template_set'] = $matches[2];
                 }
 

trunk/phpgwapi/js/dftree/dftree.css

@@ -37 +37 @@
 /* link */
 .l {
-        padding: 0px 13px 0px 0px;
+        background-repeat: no-repeat;
+        background-position: left;
+        padding: 0 2em;
         font-weight: bold;
         font-size: 10px;
-        color: #666666;
+        color: #4a79b1;
         text-decoration: none;
         cursor: pointer;
@@ -54 +56 @@
 /* selected link */
 .sl {
-        padding: 0px 13px 0px 0px;
+        background-repeat: no-repeat;
+        background-position: left;
+        padding: 0 2em; 
         font-weight: bold;
         font-size: 10px;
-        color: #0000FF;
+        color: #fc6103;
         text-decoration: none;
         cursor: pointer;

trunk/phpgwapi/js/dftree/dftree.js

@@ -228 +228 @@
                 captionSpan.style.backgroundColor = 'white';
                 captionSpan.style.border = '1px solid black';
+                captionSpan.style.paddingTop = '0px';
+                captionSpan.style.paddingBottom = '0px';
         }
 }
@@ -237 +239 @@
                 captionSpan = getObjectById("l"+this.id+this._myTree.name);
                 captionSpan.style.backgroundColor = '';
-                captionSpan.style.border = '1px solid #f7f7f7';
+                captionSpan.style.border = '0px';
+                captionSpan.style.paddingTop = '1px';
+                captionSpan.style.paddingBottom = '1px';
         }
 }
@@ -326 +330 @@
         spanL.onmouseover = function () { _this._onMouseOver(); };
         spanL.onmouseout = function () { _this._onMouseOut(); };
-        spanL.style.border = '1px solid #f7f7f7';
+//      spanL.style.border = '1px solid #f7f7f7';
         spanL.innerHTML = this.caption;
         //spanL.style.border = '1px solid red';

trunk/phpgwapi/templates/celepar/head.inc.php

@@ -43 +43 @@
                 $pngfix_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/js/pngfix.js';
                 $pngfix ='<!-- This solves the Internet Explorer PNG-transparency bug, but only for IE 5.5 and higher --> 
-                <!--[if gte IE 5.5000]>
+                <!--[if lt IE 7]>
                 <script src="'.$pngfix_src.'" type="text/javascript">
                 </script>

trunk/phpgwapi/templates/celepar/navbar.inc.php

@@ -163 +163 @@
                                 }                       
                         
-                                $app_icons .= '<td width="74px" height="40" valign="top" align="left" onclick="location.href=\''.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'\'" style="cursor:pointer;cursor:hand;background-repeat:no-repeat;padding-left:20px;background-image:url('.$var['img_root'].'/back_app.png)">'.$icon.'</td>';
+                                $app_icons .= '<td width="74px" height="40" valign="center" align="center" onclick="location.href=\''.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'\'" style="cursor:pointer;cursor:hand;background-repeat:no-repeat;padding-bottom:20px;background-image:url('.$var['img_root'].'/back_app.png)">'.$icon.'</td>';
                         }                       //                      window.location.href=\''.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'\'