Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.49.4

This commit is contained in:
Antonio Cañas Vargas 2015-11-29 22:06:22 +01:00
parent 1269f84959
commit 7ccd9ff5b0
6 changed files with 50 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
css/swad.css
View File

@ -21,7 +21,6 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not,see <http://www.gnu.org/licenses/>.
*/
a:link {text-decoration:none;}
a:visited {text-decoration:none;}
a:active {text-decoration:none;}
@ -469,7 +468,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
min-width:900px;
min-height:900px;
margin:-8px 0 0 0;
padding:16px 0;
padding:8px 0;
border-radius:6px;
box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2);
text-align:center;
@ -482,41 +481,43 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
{
box-sizing:border-box;
width:100%;
margin:0 auto;
}
#menu_horizontal .MENU_BOX
{
box-sizing:border-box;
width:100%;
height:64px;
padding:8px 16px;
margin:0 auto;
}
#menu_vertical .CANVAS /* Where content for each action is written */
#menu_horizontal .MAIN_ZONE_CANVAS /* Where content for each action is written */
{
box-sizing:border-box;
width:100%;
padding:0 16px;
padding:8px 16px;
text-align:left;
vertical-align:top;
}
#menu_horizontal ul
#menu_horizontal .MENU_LIST
{
display:table;
list-style-type:none;
margin:0 auto;
padding:0;
}
#menu_horizontal a:hover
#menu_horizontal .MENU_LIST_ITEM
{
display:table-cell;
box-sizing:border-box;
width:138px;
}
.MENU_LIST_ITEM a:hover
{
text-decoration:none;
}
#menu_horizontal li
{
display:inline-block;
}
#menu_horizontal .OPTION
{
box-sizing:border-box;
width:100px;
height:64px;
text-align:center;
margin:0 auto;
padding:32px 2px 2px 2px;
@ -543,6 +544,10 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
width:100%;
margin:0 auto;
}
a:hover #menu_vertical.MENU_LIST_ITEM
{
text-decoration:none;
}
#menu_vertical .MENU_BOX
{
display:table-cell;
@ -553,26 +558,22 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
vertical-align:top;
overflow:hidden;
}
#menu_vertical .CANVAS /* Where content for each action is written */
#menu_vertical .MAIN_ZONE_CANVAS /* Where content for each action is written */
{
display:table-cell;
box-sizing:border-box;
padding:0 16px;
padding:8px 16px;
text-align:left;
vertical-align:top;
}
#menu_vertical ul
#menu_vertical .MENU_LIST
{
display:table;
list-style-type:none;
margin:0;
padding:0;
}
#menu_vertical a:hover
{
text-decoration:none;
}
#menu_vertical li
#menu_vertical MENU_LIST_ITEM
{
display:block;
}
@ -615,14 +616,15 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
#action_title
{
box-sizing:border-box;
width:480px;
min-height:68px;
width:400px;
min-height:70px;
clear:both;
margin:0 auto;
text-align:left;
background-size:64px 64px;
background-position:0 0;
background-repeat:no-repeat;
background-position:12px 0;
padding:12px 12px 12px 105px;
padding:4px 12px 12px 70px;
overflow:hidden;
}
@ -1219,23 +1221,7 @@ a:hover img.CENTRE_PHOTO_SHOW
{
opacity:1;
}
/*
.ICON_SCALING
{
display:inline-block;
}
.ICON_SCALING:hover
{
opacity:1;
transform:scale(1.15,1.15);
}
.ICON_SCALED
{
display:inline-block;
opacity:1;
transform:scale(1.15,1.15);
}
*/
/********************************* Form fonts ********************************/
.WHITE_FORM {color:#4D88A1; font-size:13pt;}
.GREY_FORM {color:#4D88A1; font-size:13pt;}
@ -1325,7 +1311,7 @@ a:hover img.CENTRE_PHOTO_SHOW
{
list-style-type:none;
padding:0;
margin:0;
margin:0 auto;
text-align:center;
vertical-align:middle;
}

3
swad_changelog.h
View File

@ -117,11 +117,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.49.3 (2015/11/29)"
#define Log_PLATFORM_VERSION "SWAD 15.49.4 (2015/11/29)"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/*
Version 15.49.4: Nov 29, 2015 Changes in layout of menus. (186481 lines)
Version 15.49.3: Nov 29, 2015 Changes in layout of menus. (186502 lines)
Version 15.49.2: Nov 29, 2015 Changes in layout of menus. (186501 lines)
Version 15.49.1: Nov 27, 2015 Length of country names limited in listing. of countries. (186460 lines)

28
swad_layout.c
View File

@ -298,28 +298,15 @@ void Lay_WriteStartOfPage (void)
}
fprintf (Gbl.F.Out,"<div id=\"main_zone_central_container\" class=\"%s\">",
The_TabOnBgColors[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div id=\"%s\">",
Gbl.Prefs.Menu == Mnu_MENU_VERTICAL ? "menu_vertical" :
"menu_horizontal");
if (Gbl.Prefs.Menu == Mnu_MENU_VERTICAL)
{
fprintf (Gbl.F.Out,"<div id=\"menu_vertical\">");
fprintf (Gbl.F.Out,"<div class=\"MENU_BOX\">"
"<ul>");
Mnu_WriteVerticalMenuThisTab ();
fprintf (Gbl.F.Out,"</ul>"
"</div>");
}
else
{
fprintf (Gbl.F.Out,"<div id=\"menu_horizontal\">");
fprintf (Gbl.F.Out,"<div class=\"MENU_BOX\">"
"<ul>");
Mnu_WriteHorizontalMenuThisTab ();
fprintf (Gbl.F.Out,"</ul>"
"</div>");
}
/* Menu */
Mnu_WriteMenuThisTab ();
/* Start of main zone for actions output */
fprintf (Gbl.F.Out,"<div id=\"main_zone_canvas\">");
fprintf (Gbl.F.Out,"<div class=\"MAIN_ZONE_CANVAS\">");
/* Write warning when degree type does not allow direct login */
Usr_WarningWhenDegreeTypeDoesntAllowDirectLogin ();
@ -783,8 +770,7 @@ static void Lay_WriteTitleAction (void)
/***** Container start *****/
fprintf (Gbl.F.Out,"<div id=\"action_title\""
" style=\"background-image:url('%s/%s/%s64x64.gif');"
" background-size:80px 80px;\">",
" style=\"background-image:url('%s/%s/%s64x64.gif');\">",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
Act_Actions[Act_Actions[Gbl.CurrentAct].SuperAction].Icon);

12
swad_menu.c
View File

@ -70,7 +70,7 @@ const char *Mnu_MenuIcons[Mnu_NUM_MENUS] =
/******************* Write horizontal menu of current tab ********************/
/*****************************************************************************/
void Mnu_WriteHorizontalMenuThisTab (void)
void Mnu_WriteMenuThisTab (void)
{
extern const char *The_ClassMenuOn[The_NUM_THEMES];
extern const char *The_ClassMenuOff[The_NUM_THEMES];
@ -81,6 +81,10 @@ void Mnu_WriteHorizontalMenuThisTab (void)
const char *Title;
bool IsTheSelectedAction;
/***** Menu start *****/
fprintf (Gbl.F.Out,"<div class=\"MENU_BOX\">"
"<ul class=\"MENU_LIST\">");
/***** Loop to write all options in menu. Each row holds an option *****/
for (NumOptInMenu = 0;
NumOptInMenu < Act_MAX_OPTIONS_IN_MENU_PER_TAB;
@ -96,7 +100,7 @@ void Mnu_WriteHorizontalMenuThisTab (void)
Title = Act_GetSubtitleAction (NumAct);
/***** Start of element *****/
fprintf (Gbl.F.Out,"<li>");
fprintf (Gbl.F.Out,"<li class=\"MENU_LIST_ITEM\">");
/***** Start of container used to highlight this option *****/
fprintf (Gbl.F.Out,"<div class=\"%s\">",
@ -133,6 +137,10 @@ void Mnu_WriteHorizontalMenuThisTab (void)
fprintf (Gbl.F.Out,"</li>");
}
}
/***** Menu end *****/
fprintf (Gbl.F.Out,"</ul>"
"</div>");
}
/*****************************************************************************/

2
swad_menu.h
View File

@ -49,7 +49,7 @@ typedef enum
/***************************** Public prototypes *****************************/
/*****************************************************************************/
void Mnu_WriteHorizontalMenuThisTab (void);
void Mnu_WriteMenuThisTab (void);
void Mnu_WriteVerticalMenuThisTab (void);
void Mnu_PutIconsToSelectMenu (void);

2
swad_syllabus.c
View File

@ -137,7 +137,7 @@ void Syl_PutFormWhichSyllabus (void)
/***** Form to select which forums I want to see
(all my forums or only the forums of current institution/degree/course) *****/
Act_FormStart (ActSeeSyl);
fprintf (Gbl.F.Out,"<div style=\"margin:12px 0;\">"
fprintf (Gbl.F.Out,"<div style=\"margin:12px auto;\">"
"<ul class=\"LIST_CENTER\">");
for (WhichSyllabus = (Syl_WhichSyllabus_t) 0;