[CS-Project-svn_notify] SF.net SVN: cs-project:[922] trunk/1.2
Brought to you by:
crazedsanity
From: <cra...@us...> - 2009-02-04 19:10:01
|
Revision: 922 http://cs-project.svn.sourceforge.net/cs-project/?rev=922&view=rev Author: crazedsanity Date: 2009-02-04 19:09:54 +0000 (Wed, 04 Feb 2009) Log Message: ----------- Fix tabs to not have spaces under corners, change admin link to a new tab. /includes/content.inc: * move "tags" so it is the last tab in the list. * remove code that adds link to "settings" tab. * code to create admin tab (and select it as needed) if they're an admin. /public_html/css/common.css: * remove vertical alignment setting for table cells (was set to "top") /templates/infobar.shared.tmpl: * remove some extra lines so things are separated nicely * add spacing to left and right of tabs (like tabs.shared.tmpl) * valign=middle on cells containing text/url * remove " " from corner cells to remove spacing beneath image /templates/tabs.shared.tmpl: * add spacing to left and right of tabs * valign=middle on cells containing text/url * remove " " from corner cells to remove spacing beneath image Modified Paths: -------------- trunk/1.2/includes/content.inc trunk/1.2/public_html/css/common.css trunk/1.2/templates/infobar.shared.tmpl trunk/1.2/templates/tabs.shared.tmpl Modified: trunk/1.2/includes/content.inc =================================================================== --- trunk/1.2/includes/content.inc 2009-02-04 18:37:17 UTC (rev 921) +++ trunk/1.2/includes/content.inc 2009-02-04 19:09:54 UTC (rev 922) @@ -127,16 +127,11 @@ 'summary' => "Summary", 'project' => "Projects", 'helpdesk' => "Helpdesk", - 'tags' => "Tags", 'contacts' => "Contacts", 'settings' => "Settings", + 'tags' => "Tags", ); -if($user->is_admin()) { - $tabNames['settings'] = "Settings</a><BR>\n<a href=\"/content/settings/admin\"><b>[Admin]</b>"; -} - -#$page->add_template_var('tabs', $page->file_to_string('tabs.shared.tmpl')); $tabObj = new cs_tabs($page); foreach($tabNames as $moduleName=>$name) { $tabUrl = "/content/". $moduleName; @@ -146,6 +141,14 @@ } $tabObj->add_tab($name, $tabUrl); } + +if($user->is_admin()) { + $name = "Admin"; + $tabObj->add_tab($name, "/content/settings/admin"); + if(count($page->ftsSections) == 3 && $page->ftsSections[2] == 'admin') { + $tabObj->select_tab($name); + } +} $tabObj->display_tabs(); Modified: trunk/1.2/public_html/css/common.css =================================================================== --- trunk/1.2/public_html/css/common.css 2009-02-04 18:37:17 UTC (rev 921) +++ trunk/1.2/public_html/css/common.css 2009-02-04 19:09:54 UTC (rev 922) @@ -1,6 +1,6 @@ body, a, li { font-size: 8pt; font-family: helvetica, sans-serif; text-decoration:none; } a:visited {color: #0000FF; } -td {font-size: 8pt; font-family: helvetica, sans-serif; text-decoration:none; vertical-align:top; } +td {font-size: 8pt; font-family: helvetica, sans-serif; text-decoration:none; } form {margin:0; padding:0;} input, textarea { background-color: #F5F5F5; font-family: courier, sans-serif; font-size: 8pt; } Modified: trunk/1.2/templates/infobar.shared.tmpl =================================================================== --- trunk/1.2/templates/infobar.shared.tmpl 2009-02-04 18:37:17 UTC (rev 921) +++ trunk/1.2/templates/infobar.shared.tmpl 2009-02-04 19:09:54 UTC (rev 922) @@ -22,16 +22,12 @@ <table border="0" cellpadding=0 cellspacing=0> <tr> {tabs} + <td valign=top align="right" style="padding-left:1px;"><img src='/images/tab_left_inactive.gif' border='0' height="100%"></td> + <td id='notselected' valign="middle"><a id='notselected' href='/login.php?logout=1' target='_top'>Logout</a></td> + <td valign=top style="padding-right:1px;"><img src='/images/tab_right_inactive.gif' border='0' height="100%"></td> - <td valign=top align="right"><img src='/images/tab_left_inactive.gif' border='0' height="100%"></td> - - <td id='notselected' valign=top><a id='notselected' href='/login.php?logout=1' target='_top'>Logout</a></td> - - <td valign=top><img src='/images/tab_right_inactive.gif' border='0' height="100%"> </td> - - <td valign=top align="right"><img src='/images/tab_left_inactive.gif' border='0' height="100%"></td> - - <td id='notselected' valign=top><input type=hidden name='module' value='projects'> + <td valign=top align="right" style="padding-left:1px;"><img src='/images/tab_left_inactive.gif' border='0' height="100%"></td> + <td id='notselected' valign="middle"><input type=hidden name='module' value='projects'> <form action="/content" method=get> <input type="hidden" name="version" value="{cs-project_version}"> <select name=changeGroup onchange='document.forms[0].submit()'> @@ -39,8 +35,7 @@ </select> </form> </td> - - <td valign=top><img src='/images/tab_right_inactive.gif' border='0' height="100%"> </td> + <td valign=top style="padding-right:1px;"><img src='/images/tab_right_inactive.gif' border='0' height="100%"></td> </tr> </table> </td> Modified: trunk/1.2/templates/tabs.shared.tmpl =================================================================== --- trunk/1.2/templates/tabs.shared.tmpl 2009-02-04 18:37:17 UTC (rev 921) +++ trunk/1.2/templates/tabs.shared.tmpl 2009-02-04 19:09:54 UTC (rev 922) @@ -1,11 +1,11 @@ <!-- BEGIN selected_tab --> - <td valign=top align="right"><img src='/images/tab_left_active.gif' border='0' height="100%"></td> - <td id='selected' valign=top><a id='selected' href='%%url%%' target='_top'>%%title%%</a></td> - <td valign=top><img src='/images/tab_right_active.gif' border='0' height="100%"> </td> + <td valign=top align="right" style="padding-left:1px;"><img src='/images/tab_left_active.gif' border='0' height="100%"></td> + <td id='selected' valign="middle"><a id='selected' href='%%url%%' target='_top'>%%title%%</a></td> + <td valign=top style="padding-right:1px;"><img src='/images/tab_right_active.gif' border='0' height="100%"></td> <!-- END selected_tab --> <!-- BEGIN unselected_tab --> <td valign=top align="right"><img src='/images/tab_left_inactive.gif' border='0' height="100%"></td> - <td id='notselected' valign=top><a id='notselected' href='%%url%%' target='_top'>%%title%%</a></td> - <td valign=top><img src='/images/tab_right_inactive.gif' border='0' height="100%"> </td> + <td id='notselected'><div style="text:align=middle"><a id='notselected' href='%%url%%' target='_top'>%%title%%</a></td> + <td valign=top style="padding-right:1px;"><img src='/images/tab_right_inactive.gif' border='0' height="100%"></td> <!-- END unselected_tab --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |