[evolvis-commits] r11761: new version of theme; modified advanced search box↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 18:24:08 CET 2011
Author: mirabilos
Date: 2011-02-24 18:24:08 +0100 (Thu, 24 Feb 2011)
New Revision: 11761
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/Theme.class
trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/css/gforge-simple-theme.css
Log:
new version of theme; modified advanced search box
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/Theme.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/Theme.class 2011-02-24 17:24:07 UTC (rev 11760)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/Theme.class 2011-02-24 17:24:08 UTC (rev 11761)
@@ -696,24 +696,15 @@
<form name="advancedsearch" action="'.getStringFromServer('PHP_SELF').'" method="post">
<input type="hidden" name="search" value="1"/>
<input type="hidden" name="group_id" value="'.$group_id.'"/>
- <div align="center"><br />
- <table border="0">
- <tr>
- <td colspan ="2">
+ <div id="advancedsearchtext">
<input type="text" size="60" name="words" value="'.stripslashes(htmlspecialchars($words)).'" />
<input type="submit" name="submitbutton" value="'.$Language->getText('advanced_search', 'search_button').'" />
- </td>
- </tr>
- <tr>
- <td valign="top">
<input type="radio" name="mode" value="'.SEARCH__MODE_AND.'" '.($isExact ? 'checked="checked"' : '').' />'.$Language->getText('advanced_search', 'and_search').'
- </td>
- <td>
<input type="radio" name="mode" value="'.SEARCH__MODE_OR.'" '.(!$isExact ? 'checked="checked"' : '').' />'.$Language->getText('advanced_search', 'or_search').'
- </td>
- </tr>
- </table><br /></div>'
- .$this->createUnderSections($sectionsArray).'
+</div>';
+ print '<br/> '.$Language->getText('advanced_search', 'select').' <a href="javascript:setCheckBoxes(\'\',true)">'.$Language->getText('advanced_search', 'all').'</a> / <a href="javascript:setCheckBoxes(\'\', false)">'.$Language->getText('advanced_search', 'none').'</a>';
+
+ print $this->createUnderSections($sectionsArray).'
</form>';
@@ -750,19 +741,7 @@
$break = $breakLimit;
$countLines = 0;
$return = '
- <table width="100%" border="0" cellspacing="0" cellpadding="1">
- <tr class="tableheader">
- <td>
- <table width="100%" cellspacing="0" border="0">
- <tr class="tablecontent">
- <!--<td colspan="2">'.$Language->getText('advanced_search', 'search_in').':</td-->
- <td align="right">'.$Language->getText('advanced_search', 'select').' <a href="javascript:setCheckBoxes(\'\', true)">'.$Language->getText('advanced_search', 'all').'</a> / <a href="javascript:setCheckBoxes(\'\', false)">'.$Language->getText('advanced_search', 'none').'</a></td>
- </tr>
- <tr height="20" class="tablecontent">
- <td colspan="3"> </td>
- </tr>
- <tr align="center" valign="top" class="tablecontent">
- <td>';
+ <div id="advancedsearch"><ul>';
foreach($sectionsArray as $key => $section) {
$oldcountlines = $countLines;
if (is_array($section)) {
@@ -775,54 +754,39 @@
//if the next block is so large that shifting it to the next column hits the breakpoint better
//the second part of statement (behind &&) proofs, that no 4th column is added
if ((($countLines - $break) >= ($break - $countLines)) && ((($break + $breakLimit)/$breakLimit) <= 3)) {
- $return .= '</td><td>';
$break += $breakLimit;
}
}
- $return .= '<table width="90%" border="0" cellpadding="1" cellspacing="0">
- <tr><td><table width="100%" border="0" cellspacing="0" cellpadding="3">
- <tr>
- <td cellspacing="0">
- <a href="#'.$key.'">'.$Language->getText('group', $key).'</a>'
- .' </td>
- <td align="right">'
- .$Language->getText('advanced_search', 'select').' <a href="javascript:setCheckBoxes(\''.$key.'\', true)">'.$Language->getText('advanced_search', 'all').'</a> / <a href="javascript:setCheckBoxes(\''.$key.'\', false)">'.$Language->getText('advanced_search', 'none').'</a>
- </td>
- </tr>
- <tr class="tablecontent">
- <td colspan="2">';
+ $return .= '<li><fieldset><legend>'.$Language->getText('group', $key).'</legend>'
+ .$Language->getText('advanced_search', 'select').' <a href="javascript:setCheckBoxes(\''.$key.'\', true)">'.$Language->getText('advanced_search', 'all').'</a> / <a href="javascript:setCheckBoxes(\''.$key.'\', false)">'.$Language->getText('advanced_search', 'none').'</a>
+ <div id="list"><ul>
+ ';
if (!is_array($section)) {
- $return .= ' <input type="checkbox" name="'.urlencode($key).'"';
+ $return .= '<li><input type="checkbox" name="'.urlencode($key).'"';
if (isset($GLOBALS[urlencode($key)]))
$return .= ' checked="checked" ';
- $return .= ' /></input>'.$Language->getText('group', $key).'<br />';
+ $return .= ' /></input>'.$Language->getText('group', $key).'</li>';
}
else
foreach($section as $underkey => $undersection) {
- $return .= ' <input type="checkbox" name="'.urlencode($key.$underkey).'"';
+ $return .= ' <li><input type="checkbox" name="'.urlencode($key.$underkey).'"';
if (isset($GLOBALS[urlencode($key.$underkey)]))
$return .= ' checked ';
- $return .= '></input>'.$undersection.'<br />';
+ $return .= '></input>'.$undersection.'</li>';
}
-
- $return .= ' </td>
- </tr>
- </table></td></tr></table><br />';
+ $return .= '</ul></div></fieldset></li>';
if ($countLines >= $break) {
if (($countLines - $break) < ($break - $countLines)) {
- $return .= '</td><td width="33%">';
$break += $breakLimit;
}
}
}
-
- return $return.' </td>
- </tr>
- </table></td></tr></table>';
+ $return.='</div></ul>';
+ return $return;
}
/**
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/css/gforge-simple-theme.css
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/css/gforge-simple-theme.css 2011-02-24 17:24:07 UTC (rev 11760)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/css/gforge-simple-theme.css 2011-02-24 17:24:08 UTC (rev 11761)
@@ -1,7 +1,14 @@
/*main styles*/
html,body{margin: 0;padding:0}
-body{font-family: arial,sans-serif;font-size: 76%}
+body{
+ FONT: 11px Lucida Grande, Tahoma, sans-serif;
+}
+
+TD{
+ FONT: 11px Lucida Grande, Tahoma, sans-serif;
+}
+
A {text-decoration: none;color: CornFlowerBlue;}
/* styles for header */
@@ -42,8 +49,11 @@
div#toolscontent{margin: 0 210px;padding: 1em 10px}
+div#content TEXTAREA, INPUT, SELECT, OPTION {
+ FONT: 9px Lucida Grande, Tahoma, sans-serif;
+}
-div#content{margin: 0 170px;padding: 1em 10px}
+div#content{margin: 0 170px;padding: 1em 10px }
/* style for footer */
@@ -164,25 +174,25 @@
H1 {
font-family: Lucida Grande, Tahoma, sans-serif;
- font-size: x-large
+ font-size: 14px;
}
H2 {
font-family: Lucida Grande, Tahoma, sans-serif;
- font-size: large
+ font-size: 13px;
}
H3 {
font-family: Lucida Grande, Tahoma, sans-serif;
- font-size: medium
+ font-size: 12px;
}
H4 {
font-family: Lucida Grande, Tahoma, sans-serif;
- font-size: small
+ font-size: 11px;
}
H5 {
font-family: Lucida Grande, Tahoma, sans-serif;
- font-size: x-small
+ font-size: 10px;
}
H6 {
@@ -271,7 +281,7 @@
.veryimportant {
color: red;
font-weight: bold;
- font-size: large;
+ font-size: 13px;
text-align: center
}
@@ -285,6 +295,10 @@
color: white;
}
+.active A{
+ color: black;
+}
+
.inactive {
background-color: #c17d11;
}
@@ -294,18 +308,29 @@
color: white;
}
+.deleted A{
+ color: black;
+}
+
.suspended {
background-color: #edd400;
+ color: black;
}
+.suspended A{
+ color: black;
+}
.pending {
background-color: #f57900;
+
}
-/* TODO */
-/* admin users: link sono brutti
+.pending A{
+ color: black;
+}
+
*/
/* the following style is used when a word or an item should be highlighted; e.g.
selected release or words in the advanced search */
@@ -335,44 +360,44 @@
#outertabscontainer{
-
-width: 95%
-margin: 10px auto;
-background-color: #ffff;
-color: #333;
-BACKGROUND-color:#3465a4;
+ width: 95%
+ margin: 10px auto;
+ background-color: #ffff;
+ color: #333;
+ BACKGROUND-color:#3465a4;
}
#outertabs-left {
-float: left;
-width: 10px;
-margin: 0;
-padding: 1em;
+ float: left;
+ width: 10px;
+ margin: 0;
+ padding: 1em;
}
#outertabs-right {
-float: right;
-width: 40px;
-margin: 0;
-padding: 1em;
+ float: right;
+ width: 40px;
+ margin: 0;
+ padding: 1em;
}
+
#outertabs-content {
-margin-left: 20px;
-margin-right: 40px;
-border-top: #3465a4 5px solid;
+ margin-left: 20px;
+ margin-right: 40px;
+ border-top: #3465a4 5px solid;
}
#outertabs-content A {
FONT: 11px/34px Lucida Grande, Tahoma, sans-serif; TEXT-TRANSFORM: lowercase; TEXT-DECORATION: none;
- padding-right: 10px;
- padding-left: 10px;
+ padding-right: 5px;
+ padding-left: 5px;
padding-top: 10px;
padding-bottom: 10px;
color: #eeeeec;
+ BORDER-right: #729fcf 1px dotted;
}
-
#outertabs-content A#gforge-home:hover {
BORDER-TOP: #8ae234 5px solid;
}
@@ -380,24 +405,27 @@
#outertabs-content A#gforge-my:hover {
BORDER-TOP: #fce94f 5px solid
}
+
#outertabs-content A#gforge-reporting:hover {
- BORDER-TOP: #fcaf3e 5px solid
+ BORDER-TOP: #fcaf3e 5px solid;
}
+
#outertabs-content A#gforge-admin:hover {
BORDER-TOP: #e9b96e 5px solid
}
+
#outertabs-content A#gforge-people:hover {
BORDER-TOP: #8ae234 5px solid
}
+
#outertabs-content A#gforge-softwaremap:hover {
BORDER-TOP: #ad7fa8 5px solid
}
+
#outertabs-content A#gforge-snippet:hover {
BORDER-TOP: #ef2929 5px solid
}
-
-
#outertabs-content A#gforge-selected {
BORDER-TOP: #c4a000 5px solid;
background-color: #c4a000 ;
@@ -405,63 +433,57 @@
}
+/* PROJECT TABS */
+
#projecttabscontainer{
-
-width: 100%;
-margin: 0px auto;
-color: #333;
-border: 0px;
-BACKGROUND-color:#729fcf;
+ width: 100%;
+ margin: 0px auto;
+ color: #333;
+ border: 0px;
+ BACKGROUND-color:#729fcf;
}
-
#projecttabs-left {
-float: left;
-width: 160px;
-margin: 0;
-padding: 1em;
-BACKGROUND-color:#729fcf;
+ float: left;
+ width: 160px;
+ margin: 0;
+ padding: 1em;
+ BACKGROUND-color:#729fcf;
}
+
#projecttabs-right {
-float: right;
-width: 160px;
-margin: 0;
-padding: 1em;
+ float: right;
+ width: 160px;
+ margin: 0;
+ padding: 1em;
+}
-}
#projecttabs-content {
-margin-left: 200px;
-margin-right: 200px;
+ margin-left: 200px;
+ margin-right: 200px;
border-top: #729fcf 5px solid;
}
#projecttabs-content A {
FONT: 11px/34px Lucida Grande, Tahoma, sans-serif; TEXT-TRANSFORM: lowercase; TEXT-DECORATION: none;
- padding-right: 10px;
- padding-left: 10px;
+ padding-right: 7px;
+ padding-left: 7px;
padding-top: 10px;
padding-bottom: 10px;
-
+ border-right: #eeeeec 1px dotted;
color: #eeeeec;
-
}
-
#projecttabs-content A#gforge-project-summary:hover {
BORDER-TOP: #8ae234 5px solid;
}
-
-
-
#projecttabs-content A#gforge-project-admin:hover {
BORDER-TOP: #ce5c00 5px solid
}
#projecttabs-content A#gforge-project-activity:hover {
BORDER-TOP: #73d216 5px solid
}
-
-
#projecttabs-content A#gforge-project-forum:hover {
BORDER-TOP: #8f5902 5px solid
}
@@ -477,15 +499,12 @@
#projecttabs-content A#gforge-project-docman:hover {
BORDER-TOP: #a40000 5px solid
}
-
#projecttabs-content A#gforge-project-survey:hover {
BORDER-TOP: #73d216 5px solid
}
-
#projecttabs-content A#gforge-project-news:hover {
BORDER-TOP: #c17d11 5px solid
}
-
#projecttabs-content A#gforge-project-scm:hover {
BORDER-TOP: #fcaf3e 5px solid
}
@@ -501,9 +520,31 @@
#projecttabs-content A#gforge-selected {
BORDER-TOP: #204a87 5px solid;
background-color: #204a87;
+}
+div#select-deselect-all{
+ background-color: #dfdfdf;
+ padding-left: 150px;
+ left-margin: 150px;
+ width: 150px;
+ border: #204a87 1px dotted;
+}
+div#advancedsearch ul li{
+ display: inline;
}
+div#advancedsearch li{
+ text-decoration: none;
+}
+div#advancedsearch fieldset{
+ padding: 10px;
+ display: inline;
+ background-color: #dfdfdf;
+}
+div#advancedsearch #list ul li{
+ display: block;
+
+}
More information about the evolvis-commits
mailing list