Index: src/main/resources/colibri/colibri.css =================================================================== --- src/main/resources/colibri/colibri.css (revision 30573) +++ src/main/resources/colibri/colibri.css (working copy) @@ -811,6 +811,10 @@ float: none; } +#maineditmenu .topmenuentry , #maineditmenu .tmetype { + float: none; +} + /* General */ .actionmenu { background-color: $theme.menuBackgroundColor; @@ -832,7 +836,7 @@ .leftmenu { position: absolute; left: 0; - padding-left: 15px; + padding-left: 25px; } .rightmenu { @@ -853,7 +857,10 @@ } .submenu .submenuseparator { - display: none; + border-top: 1px solid $theme.textSecondaryColor; + display: block; + line-height: 1px; + margin: 7px 5px 7px 0; } .actionmenu .hasIcon { @@ -863,13 +870,29 @@ .tme-extensible { display: block; } + +.tmetype{ + color: $theme.menuLinkColor; + float: left; + font: normal normal 700 0.8em/1.8em sans-serif; + padding: 2px 5px 0 20px; + text-transform: uppercase; +} + .menuarrow { color: $theme.menuLinkColor; - font-size: .5em; - line-height: 1.8em; + font-size: 8px; + line-height: 22px; margin-right: 10px; } +.topmenuentry .separator { + display: inline-block; + font-size: .85em; + line-height: 1.8em; + margin: 0 3px 0 -3px; +} + /* Links */ .actionmenu a, .actionmenu a:visited { color: $theme.menuLinkColor; @@ -877,11 +900,12 @@ float: left; font: normal normal 700 0.8em/1.8em sans-serif; margin-right: -5px; - padding: 2px 10px 0 0px; + padding: 2px 10px 0 0; width: auto; white-space: nowrap; text-transform: uppercase; } + .actionmenu a:link, .actionmenu a:visited { cursor: pointer; } @@ -890,6 +914,19 @@ padding-left: 20px; } +.actionmenu .hasIcon a.hastype, .actionmenu a.hastype { + padding-left: 0; + text-transform: none; +} + +.actionmenu a.hastype strong { + font-weight: 400; +} + +.actionmenu a strong { + line-height: 1.8em; +} + .dropdownnolink a.tme:hover { text-decoration: none; } @@ -908,13 +945,36 @@ .actionmenu .submenuitem a, .actionmenu .submenuitem a:link, .actionmenu .submenuitem a:visited, .actionmenu .submenuitem a:active { float: none; + font-weight: normal; height: auto; line-height: 1.2em; padding: 2px 20px 0; text-align: left; + text-transform: none; } +.actionmenu .tmCreate { + background-color: #4D9244; /* $theme.buttonPrimaryBackgroundColor */ + bottom: -4px; + height: 1.85em; + margin-right: 2em; + padding-left: 10px; + position: relative; + top: 0; +} + +.tmCreate .submenu { + margin-left: -15px; + margin-top: -4px; + padding-top: 5px; +} + /* Icons */ +.actionmenu .tmCreate { + background-image: url("$xwiki.getSkinFile('icons/silk/add.gif')"); + background-position: 10px 3px; +} + .actionmenu .tmWiki { background-image: url("$xwiki.getSkinFile('icons/silk/world.gif')"); } @@ -935,10 +995,22 @@ background-image: url("$xwiki.getSkinFile('icons/silk/wrench.gif')"); } +.actionmenu .tmPage { + background-image: url("$xwiki.getSkinFile('icons/silk/page_white_text.gif')"); +} + .actionmenu .tmCreatePage, .actionmenu .tmCreatePageFromOffice { background-image: url("$xwiki.getSkinFile('icons/silk/page_white_add.gif')"); } +.actionmenu .tmCreateComment { + background-image: url("$xwiki.getSkinFile('icons/silk/comment_add.gif')"); +} + +.actionmenu .tmCreateAttachment{ + background-image: url("$xwiki.getSkinFile('icons/xwiki/attach_add.png')"); +} + .actionmenu .tmEdit { background-image: url("$xwiki.getSkinFile('icons/silk/page_white_edit.gif')"); } Index: src/main/resources/colibri/contentmenu.vm =================================================================== --- src/main/resources/colibri/contentmenu.vm (revision 30573) +++ src/main/resources/colibri/contentmenu.vm (working copy) @@ -1,18 +1,5 @@ $msg.get('core.menu.content.title')
\ No newline at end of file Index: src/main/resources/colibri/editmenu.vm =================================================================== --- src/main/resources/colibri/editmenu.vm (revision 30575) +++ src/main/resources/colibri/editmenu.vm (working copy) @@ -15,8 +15,6 @@ ## This entry must remain commented until we move all the editor to a view-like layout (ie. panels from view) ##submenuitem($doc.getURL('inline', $!languageparams) $msg.get('core.menu.edit.inline') 'tmEditInline', '') #submenuseparator() - #submenuitem($doc.getURL('edit', 'editor=rights') $msg.get('core.menu.edit.rights') 'tmEditRights', '') - #submenuseparator() #submenuitem($doc.getURL('edit', 'editor=object') $msg.get('core.menu.edit.object') 'tmEditObject', '') #if($hasAdmin) #submenuitem($doc.getURL('edit', 'editor=class') $msg.get('core.menu.edit.class') 'tmEditClass', '') @@ -32,7 +30,6 @@ shortcut.add("$msg.get('core.shortcuts.view.wiki')",function() { location.href="$doc.getURL('edit', "$!{languageparams}&editor=wiki")"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true }); shortcut.add("$msg.get('core.shortcuts.view.wysiwyg')",function() { location.href="$doc.getURL('edit', "$!{languageparams}&editor=wysiwyg")"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true }); shortcut.add("$msg.get('core.shortcuts.view.inline')",function() { location.href="$doc.getURL('inline', $!languageparams)"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true }); - shortcut.add("$msg.get('core.shortcuts.view.rights')",function() { location.href="$doc.getURL('edit', 'editor=rights')"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true }); shortcut.add("$msg.get('core.shortcuts.view.objects')",function() { location.href="$doc.getURL('edit', 'editor=object')"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true }); shortcut.add("$msg.get('core.shortcuts.view.class')",function() { location.href="$doc.getURL('edit', 'editor=class')"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true }); //]]> Index: src/main/resources/colibri/ie-6.css =================================================================== --- src/main/resources/colibri/ie-6.css (revision 30618) +++ src/main/resources/colibri/ie-6.css (working copy) @@ -2,10 +2,6 @@ position: absolute; } -.menuarrow { - font-size: .8em; -} - #company { float: left; } Index: src/main/resources/colibri/menuedit.vm =================================================================== --- src/main/resources/colibri/menuedit.vm (revision 30573) +++ src/main/resources/colibri/menuedit.vm (working copy) @@ -1,5 +1,5 @@ #if($isInServletMode)## Visible only in a page #end \ No newline at end of file Index: src/main/resources/colibri/menuview.vm =================================================================== --- src/main/resources/colibri/menuview.vm (revision 30573) +++ src/main/resources/colibri/menuview.vm (working copy) @@ -24,7 +24,7 @@ #if ($isSuperAdmin) #xwikitopmenuentry('#' $!msg.get('superadmin') 'tmUser' 'hasIcon') #else - #xwikitopmenuentrystart($xwiki.getURL($context.user, 'view') $!xwiki.getUserName($context.user, false) 'tmUser' 'hasIcon') + #xwikitopmenuentrystart($xwiki.getURL($context.user, 'view') "$msg.get('core.menu.type.profile')$!xwiki.getUserName($context.user, false)" 'tmUser' 'hasIcon') #submenuitem($xwiki.getURL($context.user, 'view') $msg.get('core.menu.profile') 'tmProfile', '') #submenuitem($xwiki.getURL($context.user, 'view', 'category=preferences') $msg.get('core.menu.userPreferences') 'tmUserPreferences', '') #if($hasWatch) @@ -36,17 +36,37 @@ #end