diff --git a/codepot/src/codepot/views/code_blame.php b/codepot/src/codepot/views/code_blame.php index 891bcede..4278c3f1 100644 --- a/codepot/src/codepot/views/code_blame.php +++ b/codepot/src/codepot/views/code_blame.php @@ -248,7 +248,7 @@ if ($login['settings'] != NULL && ?> -
+
lang->line('CODE_COMMIT') ?>
lang->line('CODE_MSG_COMMITTED_BY_ON'), $file['last_author'], $file['time']); ?> diff --git a/codepot/src/codepot/views/code_file.php b/codepot/src/codepot/views/code_file.php index 772a462a..44a49d9a 100644 --- a/codepot/src/codepot/views/code_file.php +++ b/codepot/src/codepot/views/code_file.php @@ -216,13 +216,13 @@ $this->load->view ( id}/${xpar}/{$file['prev_rev']}", '<<'); printf ('%s: %s', $this->lang->line('Revision'), $file['created_rev']); - if (!empty($file['created_tag'])) - { + if (!empty($file['created_tag'])) + { print ' '; print (''); print htmlspecialchars($file['created_tag']); print (''); - } + } print anchor ("code/file/{$project->id}/${xpar}/{$file['next_rev']}", '>>'); print ' | '; @@ -278,7 +278,7 @@ if ($login['settings'] != NULL && ?> -
+
lang->line('CODE_COMMIT') ?>
lang->line('CODE_MSG_COMMITTED_BY_ON'), $file['last_author'], $file['time']); ?> diff --git a/codepot/src/codepot/views/code_folder.php b/codepot/src/codepot/views/code_folder.php index 4aaa6fe5..84276125 100644 --- a/codepot/src/codepot/views/code_folder.php +++ b/codepot/src/codepot/views/code_folder.php @@ -458,7 +458,7 @@ $this->load->view ( print '
'; } - print '
'; + print '
'; print '
'; print $this->lang->line('CODE_COMMIT'); diff --git a/codepot/src/codepot/views/file_show.php b/codepot/src/codepot/views/file_show.php index bc77622e..590cb077 100644 --- a/codepot/src/codepot/views/file_show.php +++ b/codepot/src/codepot/views/file_show.php @@ -114,7 +114,7 @@ $this->load->view ( -
+
  • lang->line('Created on')?> createdon ?>
    • diff --git a/codepot/src/codepot/views/login.php b/codepot/src/codepot/views/login.php index 6655f3ce..8c9949e1 100644 --- a/codepot/src/codepot/views/login.php +++ b/codepot/src/codepot/views/login.php @@ -16,8 +16,10 @@
- lang->line('Home')) ?> - lang->line('Projects')) ?> +
    +
  • lang->line('Home')); ?>
    • +
  • lang->line('Projects')); ?>
    • +
diff --git a/codepot/src/codepot/views/taskbar.php b/codepot/src/codepot/views/taskbar.php index d6ab8705..54c8c034 100644 --- a/codepot/src/codepot/views/taskbar.php +++ b/codepot/src/codepot/views/taskbar.php @@ -113,10 +113,20 @@ function show_taskbar ($con, $login) print '
'; // boxb print '
'; + print '
    '; + print '
  • '; print anchor ('site/home', $con->lang->line('Home')); + print '
    • '; + print '
  • '; print anchor ('project/catalog', $con->lang->line('Projects')); + print '
    • '; if ($login['sysadmin?']) + { + print '
  • '; print anchor ('site/catalog', $con->lang->line('Administration')); + print '
    • '; + } + print '
'; print '
'; print '
'; diff --git a/codepot/src/codepot/views/wiki_home.php b/codepot/src/codepot/views/wiki_home.php index c3769ec1..3406e0b3 100644 --- a/codepot/src/codepot/views/wiki_home.php +++ b/codepot/src/codepot/views/wiki_home.php @@ -45,7 +45,7 @@ $this->load->view (
lang->line('Wikis')?>
-
+ - - - -
+
@@ -134,7 +131,7 @@ $this->load->view (
-
+
  • lang->line('Created on')?> createdon ?>
    • diff --git a/codepot/src/css/common.css b/codepot/src/css/common.css index 42263c16..c5b44b12 100644 --- a/codepot/src/css/common.css +++ b/codepot/src/css/common.css @@ -1,6 +1,7 @@ body { padding: 0; margin: 5px 5px 5px 5px; + /*margin: 0;*/ min-width: 600px; } @@ -60,6 +61,16 @@ body { line-height: 2em; vertical-align: middle; + + /* + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + */ + + /*-webkit-box-shadow: 0 8px 6px -6px #777; + -moz-box-shadow: 0 8px 6px -6px #777; + box-shadow: 0 8px 6px -6px #777;*/ } .content .taskbar .boxa { @@ -75,26 +86,36 @@ body { height: 2em; /* as large as line-height of taskbar */ width: auto; vertical-align: middle; + margin-right: 2px; + + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .content .taskbar a { text-decoration: none; - color: #ffffff; - padding-left: 0.3em; - padding-right: 0.5em; - margin: 0.1em 0.1em 0.1em 0.1em; - + color: #FFFFFF; + padding: 6px; } .content .taskbar a:hover { - background-color: #7788CC; + padding: 6px; + background-color: #4472B9; + color: #FFFFFF; + + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .content .taskbar a:active { + text-decoration: none; } .content .taskbar form { margin: 0; + padding-right: 5px; } .content .taskbar form input { @@ -108,6 +129,7 @@ body { -moz-box-shadow: 0 2px 4px #bbb inset; -webkit-box-shadow: 0 2px 4px #BBB inset; box-shadow: 0 2px 4px #BBB inset; + -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -118,15 +140,17 @@ body { vertical-align: middle; } -.content .mainarea .result { - min-height: 30em; +.content .taskbar ul { + list-style-type: none; + margin: 0; + padding: 0; } -.content .mainarea form input:focus { - background-color: #E7E8E7; - outline: 0; +.content .taskbar ul li { + display: inline; } + .content .taskbar form input[type="text"] { } @@ -171,8 +195,8 @@ body { /*margin: 0.1em 0em 0em 0em;*/ padding: 0.5em 0.5em 0.5em 0.5em; color: #FFFFFF; - background-color: #4665A2; - +/* background-color: #4665A2;*/ + background-color: #0D7A13; background-image: url("images/three-d.png"); background-repeat: repeat; } @@ -192,45 +216,82 @@ body { .content .projectbar .ctxmenu { float: right; padding: 0.1em 0em 0.1em 0em; + line-height: 2em; } .content .projectbar .fixedmenu { float: none; padding: 0.1em 0em 0.1em 0em; + line-height: 2em; } -.content .projectbar a { - text-decoration: none; - font-style: italic; - padding-left: 0.3em; - padding-right: 0.5em; - margin: 0.1em 0.1em 0.1em 0.1em; +.content .projectbar .fixedmenu a { + padding: 6px; color: #FFFFFF; } -.content .projectbar a.selected { - text-decoration: none; - font-style: italic; - padding-left: 0.3em; - padding-right: 0.5em; - margin: 0.1em 0.1em 0.1em 0.1em; - color: #333333; - background-color: #FFFFFF; +.content .projectbar .fixedmenu a:hover { + padding: 6px; + background-color: #6482A9; + color: #FFFFFFF; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } -.content .projectbar a:hover { - background-color: #9999CC; +.content .projectbar .fixedmenu a.selected { + padding: 6px; + color: #333333; + background-color: #FFFFFF; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} + +.content .projectbar .fixedmenu a.selected:hover { + padding: 6px; + background-color: #6482A9; + color: #FFFFFF; +} + +.content .projectbar .ctxmenu a { + padding: 6px; + color: #FFFFFF; +} + +.content .projectbar .ctxmenu a:hover { + padding: 6px; + background-color: #6482A9; + color: #FFFFFFF; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} + +.content .projectbar .ctxmenu a.selected { + padding: 6px; + color: #333333; + background-color: #FFFFFF; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} + +.content .projectbar .ctxmenu a.selected:hover { + padding: 6px; + background-color: #6482A9; + color: #FFFFFF; } .content .mainarea { - padding: 0.2em 0em 0.2em 0em; + padding: 0.3em 0.5em 0.3em 0.5em; } .content .mainarea .title { - font-size: 120%; + font-size: 120%; margin-top: 0.2em; margin-bottom: 0.2em; - font-weight: bold; + font-weight: bold; overflow: auto; } @@ -261,6 +322,9 @@ body { background-color: #BBCCDD; } +.content .mainarea .result { + min-height: 30em; +} .content .mainarea .form_container { padding: 0.5em 0.5em 0.5em 0.5em; @@ -281,6 +345,7 @@ body { -moz-box-shadow: 0 2px 4px #bbb inset; -webkit-box-shadow: 0 2px 4px #BBB inset; box-shadow: 0 2px 4px #BBB inset; + -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -345,6 +410,7 @@ body { -moz-box-shadow: 0 2px 4px #bbb inset; -webkit-box-shadow: 0 2px 4px #BBB inset; box-shadow: 0 2px 4px #BBB inset; + -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -402,6 +468,11 @@ body { tab-size: 5; -moz-tab-size: 5; -o-tab-size: 5; + + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + } .content .mainarea tt { @@ -492,6 +563,7 @@ body { /* this is used for line numbering. */ .content .mainarea pre.prettyprint ol { white-space: pre-wrap; + } .content .mainarea pre.prettyprint { @@ -507,6 +579,11 @@ body { tab-size: 5; -moz-tab-size: 5; -o-tab-size: 5; + + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + } pre.prettyprint .pln { color: #222222; } @@ -582,10 +659,10 @@ pre.prettyprint li.L9 { background: #eee } margin: 0.3em 0em 0em 0em; padding: 0.3em 0.3em 0.3em 0.3em; text-align: right; - -moz-border-radius-bottomleft:2px; - -moz-border-radius-bottomright:2px; - -moz-border-radius-topleft:2px; - -moz-border-radius-topright:2px; + + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .content .infostrip a { @@ -602,7 +679,7 @@ pre.prettyprint li.L9 { background: #eee } .content .sidebar .box { /* box in an sidebar to present actual information */ padding:8px 8px 8px 8px; - margin: 1px 1px 2px 1px; + margin: 1px 1px 5px 1px; display:block; overflow: auto; @@ -612,10 +689,14 @@ pre.prettyprint li.L9 { background: #eee } /* background: #DDDDDD none repeat scroll 0 0; border: #CCCCCC 1px solid; */ - -moz-border-radius-bottomleft:2px; - -moz-border-radius-bottomright:2px; - -moz-border-radius-topleft:2px; - -moz-border-radius-topright:2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + +/* + -webkit-box-shadow: 0 8px 6px -6px #777; + -moz-box-shadow: 0 8px 6px -6px #777; + box-shadow: 0 8px 6px -6px #777;*/ } .content .sidebar .box .user_icon_img { @@ -625,6 +706,10 @@ pre.prettyprint li.L9 { background: #eee } padding-top: 1px; padding-bottom: 1px; padding-right: 1px; + + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .content .sidebar .boxtitle { @@ -670,6 +755,17 @@ pre.prettyprint li.L9 { background: #eee } padding: 0.2em 0 0.2em 1em; } +.content .infobox { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + +/* + -webkit-box-shadow: 0 8px 6px -6px #777; + -moz-box-shadow: 0 8px 6px -6px #777; + box-shadow: 0 8px 6px -6px #777;*/ +} + .content .footer { clear: both; padding: 0.3em 0.5em 0.3em 0.5em; @@ -679,7 +775,18 @@ pre.prettyprint li.L9 { background: #eee } text-align: right; color: #FFFFFF; background-color: #4665A2; - line-height: 1.5em; + background-color: #203150; + line-height: 2em; + + /* + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + */ + + /*-webkit-box-shadow: 0 8px 6px -6px #777; + -moz-box-shadow: 0 8px 6px -6px #777; + box-shadow: 0 8px 6px -6px #777;*/ } .content .footer a { @@ -736,10 +843,6 @@ pre.prettyprint li.L9 { background: #eee } background-color: black; padding: 0.6em 0.6em 0.6em 0.6em; float: right; - -moz-border-radius-bottomleft:2px; - -moz-border-radius-bottomright:2px; - -moz-border-radius-topleft:2px; - -moz-border-radius-topright:2px; white-space: nowrap; }