[Mapbender-commits] r6558 - in branches/2.6: http/css http/frames
http/php resources/locale/de_DE/LC_MESSAGES
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Sun Jul 4 06:24:00 EDT 2010
Author: verenadiewald
Date: 2010-07-04 10:24:00 +0000 (Sun, 04 Jul 2010)
New Revision: 6558
Modified:
branches/2.6/http/css/login.css
branches/2.6/http/frames/login.php
branches/2.6/http/php/mb_listGUIs.php
branches/2.6/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
Log:
http://trac.osgeo.org/mapbender/ticket/658
Modified: branches/2.6/http/css/login.css
===================================================================
--- branches/2.6/http/css/login.css 2010-07-04 10:23:09 UTC (rev 6557)
+++ branches/2.6/http/css/login.css 2010-07-04 10:24:00 UTC (rev 6558)
@@ -23,28 +23,23 @@
height: 20px;
}
-.list_guis{
- font-family: Arial, Helvetica, sans-serif;
- font-size : 12px;
- color: #808080;
-}
a:link{
- font-family: Arial, Helvetica, sans-serif;
- font-size : 12px;
text-decoration : none;
color: #808080;
}
+
a:visited {
- font-family: Arial, Helvetica, sans-serif;
text-decoration : none;
- color: #808080;
- font-size : 12px;
}
+
+a:hover {
+ /*color: #808080;*/
+ text-decoration : none;
+
+}
+
a:active {
- font-family: Arial, Helvetica, sans-serif;
text-decoration : none;
- color: #808080;
- font-size : 12px;
}
.login_text{
@@ -53,27 +48,9 @@
/* BEGIN gui listing */
ul.gui_list {
- width: 80%;
padding: 2px;
- border: 0px solid #666;
}
-h2.gui_category,
-p.gui_category_description{
- width: 50%;
- padding: 0px;
- border: 0px solid #666;
-}
-
-h2.gui_category,
-ul.gui_list {
- /*background-color: #eee;*/
-}
-
-h2.gui_category {
- font-size: 1.3em;
-}
-
img {
border: 0;
}
@@ -88,41 +65,23 @@
padding: .25em .5em;
background-color: #fff;
border: 0px solid #666;
- cursor: pointer;
}
-ul.gui_list li.alternate {
- background-color: #fff;
+div.categoryDescription {
+ font-size: 15px;
+ color: #808080;
}
-ul.gui_list li.alternate {
- background-color: #fff;
+div.guiDescription {
+ font-size: 12px;
+ color: #808080;
}
-ul.gui_list li:hover {
- background-color: #eee;
+div.guiListTabs {
+ margin-top:15px;
}
-ul.gui_list li strong {
- float: left;
- width: 25%;
- font-weight: bold;
+a.guiLink {
+ color:#000000;
}
-
-ul.gui_list li em {
- float: right;
- width: 75%;
- margin-top: -1.2em;
- color: #666;
-}
-
-.gui_list a:link,
-.gui_list a:visited,
-.gui_list a:active {
- font-size: inherit;
- font-weight: inherit;
- text-decoration: none;
- text-transform: none;
- color: inherit;
-}
/* END gui listing */
\ No newline at end of file
Modified: branches/2.6/http/frames/login.php
===================================================================
--- branches/2.6/http/frames/login.php 2010-07-04 10:23:09 UTC (rev 6557)
+++ branches/2.6/http/frames/login.php 2010-07-04 10:24:00 UTC (rev 6558)
@@ -86,6 +86,11 @@
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
?>
<title>Login</title>
+<script type="text/javascript" src="../extensions/jquery-ui-1.7.2.custom/js/jquery-1.3.2.min.js"></script>
+<script type="text/javascript" src="../extensions/jquery-ui-1.7.2.custom/js/jquery-ui-1.7.2.custom.min.js"></script>
+<script type="text/javascript" src="../extensions/jquery-ui-1.7.2.custom/development-bundle/ui/.ui.tabs.js"></script>
+<link rel="stylesheet" type="text/css" href="../extensions/jquery-ui-1.7.2.custom/development-bundle/themes/base/ui.all.css" />
+<link rel="stylesheet" type="text/css" href="../extensions/jquery-ui-1.7.2.custom/development-bundle/themes/base/ui.tabs.css" />
<?php
$css_folder = "";
echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../css/" . $css_folder . "login.css\">";
@@ -116,6 +121,23 @@
echo "</script>";
}
+?>
+
+<script type='text/javascript'>
+$(document).ready(function () {
+ $(function() {
+ $("#guiListTabs").tabs({
+ event: 'mouseover'
+ });
+ //$("a", ".gui_list").button();
+ //$("a", ".gui_list").click(function() { return false; });
+
+ });
+});
+</script>
+
+<?php
+
echo "</head>";
echo "<body onload='setFocus()'>";
Modified: branches/2.6/http/php/mb_listGUIs.php
===================================================================
--- branches/2.6/http/php/mb_listGUIs.php 2010-07-04 10:23:09 UTC (rev 6557)
+++ branches/2.6/http/php/mb_listGUIs.php 2010-07-04 10:24:00 UTC (rev 6558)
@@ -47,39 +47,82 @@
}
$sql .= ") ORDER BY gc.category_name, gui_name";
-
+
$result = db_prep_query($sql,$v,$t);
$category = NULL;
-echo "<h2><font align='left' color='#000000'>Ma</font><font color='#0000CE'>p</font><font color='#C00000'>b</font><font color='#000000'>ender </font> - "._mb('available Applications')."</h2>";
- printf("<p><a href=\"../php/mod_logout.php?%s\"><img src=\"../img/button_gray/logout_off.png\" onmouseover=\"this.src='../img/button_gray/logout_over.png'\" onmouseout=\"this.src='../img/button_gray/logout_off.png'\" title=\"Logout\"></a></p>",SID);
+ echo "<span style='color:#000000;font-size:24px;font-weight:bold;'>Ma</span>".
+ "<span style='color:#0000CE;font-size:24px;font-weight:bold;'>p</span>".
+ "<span style='color:#C00000;font-size:24px;font-weight:bold;'>b</span>".
+ "<span style='color:#000000;font-size:24px;font-weight:bold;'>ender</span>".
+ "<span style='font-size:24px;font-weight:bold;'> - "._mb('available applications')." </span>";
+
+ printf("<span style='float:right;'><a href=\"../php/mod_logout.php?%s\"><img src=\"../img/button_gray/logout_off.png\" onmouseover=\"this.src='../img/button_gray/logout_over.png'\" onmouseout=\"this.src='../img/button_gray/logout_off.png'\" title=\"Logout\"></a></span>",SID);
+
+ echo "<div id='guiListTabs' class='guiListTabs'>";
+
+ echo "<ul>";
+
$total_guis = 0;
+ $totalCategories = 0;
+ $divHtml = "";
while($row = db_fetch_array($result)){
+
if($category !== $row["category_name"]) {
+ if($divHtml != "") {
+ $divHtml .= '</ul></div>';
+ }
$category = $row["category_name"];
- echo "</ul>";
-
if(strlen($row["category_name"]) > 0) {
- printf("<h2 class=\"gui_category\">%s</h2>",$row["category_name"]);
- }else{
- printf("<h2 class=\"gui_category\">%s</h2>","");
+ echo '<li><a href="#guiListTab-'.$totalCategories.'">' . $row["category_name"] . '</a></li>';
}
- if(strlen($row["category_description"]) > 0) {
- printf("<p class=\"gui_category_description\"><em>%s</em></p>",$row["category_description"]);
- }else{
- printf("<p class=\"gui_category_description\"><em>%s</em></p>","");
+ else {
+ echo '<li><a href="#guiListTab-'.$totalCategories.'">'._mb('Others').'</a></li>';
}
- echo "<ul class=\"gui_list\">";
+
+ if($row["category_description"] == '') {
+ $row["category_description"] = ' ';
+ }
+ $divHtml .= '<div id="guiListTab-' . $totalCategories . '">';
+ $divHtml .= '<div class="categoryDescription">';
+ $divHtml .= "<p><em>".$row["category_description"]."</em></p>";
+ $divHtml .= '</div>';
+ $divHtml .= '<ul class="gui_list">';
+
+ $totalCategories++;
}
- $class = ($total_guis %2 === 0) ? " class=\"alternate\"" : NULL;
- $url = sprintf("index.php?%s&gui_id=%s",strip_tags(SID),$row["gui_id"]);
- printf("<li%s><a style=\"font-weight:bold\" href=\"%s\">%s<br /><em>%s</em></a></li>",$class,$url,$row["gui_name"],$row["gui_description"]);
+ if(count($row["category_name"]) === 0 && !$dummyCategorySet && $divHtml == "") {
+ echo '<li><a href="#guiListTab-0">'._mb('Others').'</a></li>';
+ $divHtml .= '<div id="guiListTab-0">';
+ $divHtml .= '<div class="categoryDescription">';
+ $divHtml .= "<p><em> </em></p>";
+ $divHtml .= '</div>';
+ $divHtml .= '<ul class="gui_list">';
+
+ $dummyCategorySet = true;
+ }
+
+ $url = "index.php?".strip_tags(SID)."&gui_id=".$row["gui_id"];
+ $divHtml .= "<li><div>".
+ "<a class='guiLink' href='".$url."'>".$row['gui_name']."</a></div>".
+ "<div class='guiDescription'><em>".$row["gui_description"]."</em></div></li>";
+
$total_guis++;
}
+
+ echo "</ul>";
+
+ if($divHtml != "") {
+ $divHtml .= '</ul></div>';
+ }
+
+ echo $divHtml;
+
+ echo "</div>";
}
?>
\ No newline at end of file
Modified: branches/2.6/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
===================================================================
--- branches/2.6/resources/locale/de_DE/LC_MESSAGES/Mapbender.po 2010-07-04 10:23:09 UTC (rev 6557)
+++ branches/2.6/resources/locale/de_DE/LC_MESSAGES/Mapbender.po 2010-07-04 10:24:00 UTC (rev 6558)
@@ -451,10 +451,14 @@
msgid "Details"
msgstr "Details"
-#: http/php/mb_listGUIs.php:54 ../http/php/mb_listGUIs.php:54
-msgid "available Applications"
+#: http/php/mb_listGUIs.php:59
+msgid "available applications"
msgstr "Liste der verfügbaren Anwendungen"
+#: http/php/mb_listGUIs.php:82 ../http/php/mb_listGUIs.php:99
+msgid "Others"
+msgstr "Sonstige"
+
#: http/javascripts/mod_measure.php:298
msgid "Close polygon"
msgstr "Polygon schliessen"
More information about the Mapbender_commits
mailing list