[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm londocs.pm mydesk.tab
raeburn
raeburn at source.lon-capa.org
Sat May 25 17:56:23 EDT 2013
raeburn Sat May 25 21:56:23 2013 EDT
Modified files:
/loncom/interface mydesk.tab loncommon.pm londocs.pm
Log:
- Items in "Personal" sub-menu in primary menu moved from a separate item
on right of screen to sub-menu attached to user's fullname on left of
screen.
- "Information" item added (points to user's personal information page)
as first item in sub-menu.
- xhtml for items in Functions bar, displayed when viewing a user's
personal information page in course context.
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.158 loncom/interface/mydesk.tab:1.159
--- loncom/interface/mydesk.tab:1.158 Mon May 6 15:02:49 2013
+++ loncom/interface/mydesk.tab Sat May 25 21:56:23 2013
@@ -14,18 +14,22 @@
# - nonewmsg: only display if there aren't any new messages
# - roles: show Roles instead of Courses
# - courses: show Courses instead of Roles
-# prim:link:icon:alt:text:condition
-prim:/adm/about.html:/adm/lonIcons/minilogo.gif:LON-CAPA Logo:About:public
-prim:/adm/menu:::Home:
-prim:/adm/communicate:::Messages:nonewmsg
-prim:/adm/communicate:::New Messages:newmsg
-prim::::Personal:
-prim:/adm/roles:::Roles:roles
-prim:/adm/roles:::Courses:courses
-prim:/adm/helpdesk:::Help:onlypublic
-prim:/adm/roles:::Log In:onlypublic
-prim::::Help:
-prim:/adm/logout:::Logout:
+# position: where link is to be displayed
+# possible positions:
+# - empty (will be displayed on right side -- default location).
+# - left
+# prim:link:icon:alt:text:condition:position
+prim::::Personal::left
+prim:/adm/about.html:/adm/lonIcons/minilogo.gif:LON-CAPA Logo:About:public:
+prim:/adm/menu:::Home::
+prim:/adm/communicate:::Messages:nonewmsg:
+prim:/adm/communicate:::New Messages:newmsg:
+prim:/adm/roles:::Roles:roles:
+prim:/adm/roles:::Courses:courses:
+prim:/adm/helpdesk:::Help:onlypublic:
+prim:/adm/roles:::Log In:onlypublic:
+prim::::Help::
+prim:/adm/logout:::Logout::
# primary sub-menu links
# Apache::lonmenu::primary_menu() generates a sub-menus from these elements
@@ -41,11 +45,12 @@
# - wishlist: link displayed if user has privileges to use Stored Links
# - reqcrs: link displayed if user can request Course or Community creation
# primsub:parent:link:text:condition
+primsub:Personal:/adm/[domain]/[user]/aboutme:Information:
primsub:Personal:/adm/preferences:Preferences:
primsub:Personal:/adm/portfolio:Portfolio:portfolio
primsub:Personal:/adm/wishlist:Stored Links:wishlist
primsub:Personal:/adm/announcements:Calendar:
-primsub:Personal:/adm/[domain]/[user]/_rss.html:Feeds:blog
+primsub:Persona;:/adm/[domain]/[user]/_rss.html:Feeds:blog
# secondary menu links
# Apache::lonmenu::secondary_menu() generates a menu from these elements
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1129 loncom/interface/loncommon.pm:1.1130
--- loncom/interface/loncommon.pm:1.1129 Tue May 21 18:54:15 2013
+++ loncom/interface/loncommon.pm Sat May 25 21:56:23 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1129 2013/05/21 18:54:15 raeburn Exp $
+# $Id: loncommon.pm,v 1.1130 2013/05/25 21:56:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5155,16 +5155,12 @@
my $bodytag = "<body $extra_body_attr>".
&Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'});
- if ($bodyonly) {
+ if (($bodyonly) || ($no_nav_bar) || ($env{'form.inhibitmenu'} eq 'yes')) {
return $bodytag;
- }
+ }
- my $name = &plainname($env{'user.name'},$env{'user.domain'});
if ($public) {
undef($role);
- } else {
- $name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'},
- undef,'LC_menubuttons_link');
}
my $titleinfo = '<h1>'.$title.'</h1>';
@@ -5182,35 +5178,31 @@
$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
- if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') {
- return $bodytag;
- }
-
if ($env{'request.state'} eq 'construct') { $forcereg=1; }
# if ($env{'request.state'} eq 'construct') {
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
# }
+ $bodytag .= Apache::lonhtmlcommon::scripttag(
+ Apache::lonmenu::utilityfunctions(), 'start');
+ my ($left,$right) = Apache::lonmenu::primary_menu();
if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
if ($dc_info) {
$dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
}
- $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
+ $bodytag .= qq|<div id="LC_nav_bar">$left $role<br />
<em>$realm</em> $dc_info</div>|;
return $bodytag;
}
unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
- $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>|;
+ $bodytag .= qq|<div id="LC_nav_bar">$left $role</div>|;
}
- $bodytag .= Apache::lonhtmlcommon::scripttag(
- Apache::lonmenu::utilityfunctions(), 'start');
-
- $bodytag .= Apache::lonmenu::primary_menu();
+ $bodytag .= $right;
if ($dc_info) {
$dc_info = &dc_courseid_toggle($dc_info);
@@ -5410,6 +5402,14 @@
vertical-align:middle;
}
+.LC_floatleft {
+ float: left;
+}
+
+.LC_floatright {
+ float: right;
+}
+
.LC_400Box {
width:400px;
}
@@ -6499,6 +6499,7 @@
}
.LC_dccid {
+ float: right;
margin: 0.2em 0 0 0;
padding: 0;
font-size: 90%;
@@ -6596,7 +6597,6 @@
}
ol.LC_primary_menu {
- float: right;
margin: 0;
padding: 0;
background-color: $pgbg_or_bgcolor;
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.550 loncom/interface/londocs.pm:1.551
--- loncom/interface/londocs.pm:1.550 Tue May 21 19:30:11 2013
+++ loncom/interface/londocs.pm Sat May 25 21:56:23 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.550 2013/05/21 19:30:11 raeburn Exp $
+# $Id: londocs.pm,v 1.551 2013/05/25 21:56:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3123,11 +3123,9 @@
push(@{$filtersref->{'canremove'}},$orderidx);
}
}
- unless ($isexternal) {
- $renamelink=(<<ENDREN);
+ $renamelink=(<<ENDREN);
<a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a>
ENDREN
- }
$line.=(<<END);
<td>
<div class="LC_docs_entry_move">
More information about the LON-CAPA-cvs
mailing list