hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switched to use the flex css element for taskbar layout

Browse Source
This commit is contained in:
hyung-hwan
2016-12-19 16:48:16 +00:00
parent da125cb54f
commit 5c7bbe41f7
4 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
codepot/src/codepot/views/login.php
View File

@ -20,15 +20,15 @@
<!----------------------------------------------------------------------------> <!---------------------------------------------------------------------------->
<div class='taskbar'> <div class='taskbar'>
<div class="boxb">
</div>
<div class="boxa"> <div class="boxa">
<ul> <ul>
<li><?php print anchor ('site/home', $this->lang->line('Home')); ?></li> <li><?php print anchor ('site/home', $this->lang->line('Home')); ?></li>
<li><?php print anchor ('project/catalog', $this->lang->line('Projects')); ?></li> <li><?php print anchor ('project/catalog', $this->lang->line('Projects')); ?></li>
</ul> </ul>
</div> </div>
<div class="boxb">
</div>
</div> </div>

2
codepot/src/codepot/views/project_map.php
View File

@ -283,7 +283,7 @@ var GraphApp = (function()
{ {
if (this.graph !== null) if (this.graph !== null)
{ {
// make it low so that the footer gets places at the right place. // make it small so that the footer gets places at the right place.
this.graph.setSize (300, 300); this.graph.setSize (300, 300);
var hoff = this.header.offset(); var hoff = this.header.offset();

39
codepot/src/codepot/views/taskbar.php
View File

@ -5,6 +5,26 @@ function show_taskbar ($con, $login)
print '<div class="taskbar">'; print '<div class="taskbar">';
print "\n"; print "\n";
print '<div class="boxa">';
print '<ul>';
print '<li>';
print anchor ('site/home', $con->lang->line('Home'));
print '</li>';
print '<li>';
print anchor ('project/catalog', $con->lang->line('Projects'));
print '</li>';
print '<li><span class="ui-widget">';
print " <input id='taskbar_project_to_find' placeholder='{$con->lang->line('Project ID')}' size=40>";
print '</span></li>';
if ($login['sysadmin?'])
{
print '<li>';
print anchor ('site/catalog', $con->lang->line('Administration'));
print '</li>';
}
print '</ul>';
print '</div>'; // boxa
print '<div class="boxb">'; print '<div class="boxb">';
if (isset($login['id']) && $login['id'] != '') if (isset($login['id']) && $login['id'] != '')
@ -66,26 +86,7 @@ function show_taskbar ($con, $login)
} }
print '</div>'; // boxb print '</div>'; // boxb
print '<div class="boxa">';
print '<ul>';
print '<li>';
print anchor ('site/home', $con->lang->line('Home'));
print '</li>';
print '<li>';
print anchor ('project/catalog', $con->lang->line('Projects'));
print '</li>';
print '<li><span class="ui-widget">';
print " <input id='taskbar_project_to_find' placeholder='{$con->lang->line('Project ID')}' size=40>";
print '</span></li>';
if ($login['sysadmin?'])
{
print '<li>';
print anchor ('site/catalog', $con->lang->line('Administration'));
print '</li>';
}
print '</ul>';
print '</div>'; // boxa
print '</div>'; print '</div>';
} }

37
codepot/src/css/common.css
View File

@ -132,15 +132,46 @@ pre, code, tt {
line-height: 2em; line-height: 2em;
vertical-align: middle; vertical-align: middle;
display: -webkit-flex;
display: -moz-flex;
display: flex;
-webkit-flex-wrap: nowrap;
-moz-flex-wrap: nowrap;
flex-wrap: nowrap;
-webkit-justify-content: space-between;
-moz-justify-content: space-between;
justify-content: space-between;
} }
.content .taskbar .boxa { .content .taskbar .boxa {
/*vertical-align: bottom;*/ display: -webkit-flex;
float: none; display: -moz-flex;
display: flex;
-webkit-flex: 0 0 auto;
-moz-flex: 0 0 auto;
flex: 0 0 auto;
-webkit-justify-content: flex-start;
-moz-justify-content: flex-start;
justify-content: flex-start;
} }
.content .taskbar .boxb { .content .taskbar .boxb {
float: right; display: -webkit-flex;
display: -moz-flex;
display: flex;
-webkit-flex: 0 0 auto;
-moz-flex: 0 0 auto;
flex: 0 0 auto;
-webkit-justify-content: flex-end;
-moz-justify-content: flex-end;
justify-content: flex-end;
} }
.content .taskbar .boxa a { .content .taskbar .boxa a {