Attachment #70139 for bug #19851

View | Details | Raw Unified | Return to bug 19851
Collapse All | Expand All




table#ill-requests {
    width: 100% !important;
}

#helper span {
    display: none;
}

#logged-in-info-full {
    display: none;
}

.loggedin-menu-label {
    color: #777;
    font-size: 12px;
    line-height: 1.42857143;
    padding: 4px 12px;
    white-space: nowrap;
}

.loggedin-menu-label.divider {
    padding: 0;
}

.loggedin-menu-label span {
    color: #000;
    font-weight: bold;
}

@media (min-width: 200px) {
    .navbar-nav > li {
        float: left;
    }
    .navbar-right {
        float: right !important;
        margin-right: -15px;
    }
    .navbar-nav {
        float: left;
        margin: 0;
    }

    .navbar-nav .open .dropdown-menu {
        position: absolute;
        float: left;
        left: auto;
        right: 0;
        width: auto;
        background-color: #fff;
        border: 1px solid rgba(0,0,0,0.15);
        box-shadow: 0 6px 12px rgba(0,0,0,0.175);
    }
}

@media (min-width: 800px) {
    #helper span {
        display: inline;
    }

    #helper i {
        display: none;
    }

    #logged-in-info-full {
        display: inline;
    }

    #logged-in-info-brief {
        display: none;
    }
    .loggedin-menu-label {
        display: none;
    }
}

Lines 2-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc (-1 / +1 lines)
2	[% USE String %]	2	[% USE String %]
3	[% PROCESS 'html_helpers.inc' %]	3	[% PROCESS 'html_helpers.inc' %]
4	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	4	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5		5	<meta name="viewport" content="width=device-width, initial-scale=1" />
6	[%# Prevent XFS attacks -%]	6	[%# Prevent XFS attacks -%]
7	[% UNLESS popup %]	7	[% UNLESS popup %]
8	<style id="antiClickjack">body{display:none !important;}</style>	8	<style id="antiClickjack">body{display:none !important;}</style>




                </ul>
            </li>
            [% IF ( intranetbookbag ) %]
                <li>
                    <a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a>
                </li>
            [% END %]
            [% IntranetNav %]
            <li class="dropdown">

                <ul class="dropdown-menu">
                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
                    [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
                        <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
                    [% END %]
                    [% IF ( CAN_user_acquisition ) %]
                        <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
                    [% END %]
                    <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
                    [% IF ( CAN_user_serials ) %]
                        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
                    [% END %]
                    [% IF ( UseCourseReserves ) %]
                        <li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></li>
                    [% END %]
                    [% IF ( CAN_user_reports ) %]
                        <li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
                    [% END %]
                    [% IF ( CAN_user_tools ) %]
                        <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
                    [% END %]
                    [% IF ( CAN_user_parameters ) %]
                        <li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li>
                    [% END %]
                    <li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
                </ul>
            </li>
        </ul>
        <ul class="nav navbar-nav navbar-right">
            [% IF ( loggedinusername ) %]
            <li class="dropdown">
                <a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown">
                    <span id="logged-in-info-brief">
                        <i class="fa fa-user"></i>
                    </span>
                    <span id="logged-in-info-full">
                        <span class="loggedinusername">[% loggedinusername %]</span>
                        <span class="separator">|</span>
                        [% IF ( AutoLocation ) %]
                            <brand>
                                [% LoginBranchname %]
                            </brand>
                        [% ELSE %]
                            <strong>
                                [% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
                                    NO LIBRARY SET
                                [% ELSE %]
                                    <span id="logged-in-branch-name">[% LoginBranchname %]</span>
                                    <span id="logged-in-branch-code" class="content_hidden">[% Branches.GetLoggedInBranchcode %]</span>
                                [% END %]
                            </strong>
                        [% END %]
                    </span>
                    <b class="caret"></b>
                </a>
                <ul class="dropdown-menu" role="menu" aria-labelledby="drop3">

                    <li class="loggedin-menu-label">
                        Logged in as:<br />
                        <span class="loggedinusername">[% loggedinusername %]</span>
                    </li>
                    <li class="loggedin-menu-label">
                        [% IF ( AutoLocation ) %]
                            <brand>
                                [% LoginBranchname %]
                            </brand>
                        [% ELSE %]
                            [% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
                                NO LIBRARY SET
                            [% ELSE %]
                                Location: <br />
                                <span id="logged-in-branch-name">[% LoginBranchname %]</span>
                                <span id="logged-in-branch-code" class="content_hidden">[% Branches.GetLoggedInBranchcode %]</span>
                            [% END %]
                        [% END %]
                    </li>

                    <li role="separator" class="loggedin-menu-label divider"></li>
                    [% IF ( IndependentBranches ) %]
                        [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
                    <li>

            </li>
            [% INCLUDE 'langmenu-staff-top.inc' %]
            <li>
                <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
            </li>
            [% ELSE %]
            <li class="loggedout">
                <span>
                    <a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>
                    <span class="separator">|</span>
                    <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
                </span>
            </li>
            [% END %]
- 

Return to bug 19851

Lines 3137-3139 fieldset.rows + fieldset.action { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+71 lines)
3137	table#ill-requests {	3137	table#ill-requests {
3138	width: 100% !important;	3138	width: 100% !important;
3139	}	3139	}
		3140
		3141	#helper span {
		3142	display: none;
		3143	}
		3144
		3145	#logged-in-info-full {
		3146	display: none;
		3147	}
		3148
		3149	.loggedin-menu-label {
		3150	color: #777;
		3151	font-size: 12px;
		3152	line-height: 1.42857143;
		3153	padding: 4px 12px;
		3154	white-space: nowrap;
		3155	}
		3156
		3157	.loggedin-menu-label.divider {
		3158	padding: 0;
		3159	}
		3160
		3161	.loggedin-menu-label span {
		3162	color: #000;
		3163	font-weight: bold;
		3164	}
		3165
		3166	@media (min-width: 200px) {
		3167	.navbar-nav > li {
		3168	float: left;
		3169	}
		3170	.navbar-right {
		3171	float: right !important;
		3172	margin-right: -15px;
		3173	}
		3174	.navbar-nav {
		3175	float: left;
		3176	margin: 0;
		3177	}
		3178
		3179	.navbar-nav .open .dropdown-menu {
		3180	position: absolute;
		3181	float: left;
		3182	left: auto;
		3183	right: 0;
		3184	width: auto;
		3185	background-color: #fff;
		3186	border: 1px solid rgba(0,0,0,0.15);
		3187	box-shadow: 0 6px 12px rgba(0,0,0,0.175);
		3188	}
		3189	}
		3190
		3191	@media (min-width: 800px) {
		3192	#helper span {
		3193	display: inline;
		3194	}
		3195
		3196	#helper i {
		3197	display: none;
		3198	}
		3199
		3200	#logged-in-info-full {
		3201	display: inline;
		3202	}
		3203
3204	#logged-in-info-brief {
3205	display: none;
3206	}
3207	.loggedin-menu-label {
3208	display: none;
3209	}
3210	}

Lines 12-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-28 / +56 lines)
12	</ul>	12	</ul>
13	</li>	13	</li>
14	[% IF ( intranetbookbag ) %]	14	[% IF ( intranetbookbag ) %]
15	<li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>	15	<li>
		16	<a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a>
		17	</li>
16	[% END %]	18	[% END %]
17	[% IntranetNav %]	19	[% IntranetNav %]
18	<li class="dropdown">	20	<li class="dropdown">
Lines 20-73 Link Here
20	<ul class="dropdown-menu">	22	<ul class="dropdown-menu">
21	<li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>	23	<li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
22	[% IF ( CAN_user_editcatalogue_edit_catalogue \|\| CAN_user_editcatalogue_edit_items ) %]	24	[% IF ( CAN_user_editcatalogue_edit_catalogue \|\| CAN_user_editcatalogue_edit_items ) %]
23	<li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>	25	<li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
24	[% END %]	26	[% END %]
25	[% IF ( CAN_user_acquisition ) %]	27	[% IF ( CAN_user_acquisition ) %]
26	<li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>	28	<li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
27	[% END %]	29	[% END %]
28	<li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>	30	<li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
29	[% IF ( CAN_user_serials ) %]	31	[% IF ( CAN_user_serials ) %]
30	<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>	32	<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
31	[% END %]	33	[% END %]
32	[% IF ( UseCourseReserves ) %]	34	[% IF ( UseCourseReserves ) %]
33	<li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></li>	35	<li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></li>
34	[% END %]	36	[% END %]
35	[% IF ( CAN_user_reports ) %]	37	[% IF ( CAN_user_reports ) %]
36	<li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>	38	<li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
37	[% END %]	39	[% END %]
38	[% IF ( CAN_user_tools ) %]	40	[% IF ( CAN_user_tools ) %]
39	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>	41	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
40	[% END %]	42	[% END %]
41	[% IF ( CAN_user_parameters ) %]	43	[% IF ( CAN_user_parameters ) %]
42	<li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li>	44	<li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li>
43	[% END %]	45	[% END %]
44	<li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>	46	<li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
45	</ul>	47	</ul>
46	</li>	48	</li>
47	</ul>	49	</ul>
48	<ul class="nav navbar-nav pull-right">	50	<ul class="nav navbar-nav navbar-right">
49	[% IF ( loggedinusername ) %]	51	[% IF ( loggedinusername ) %]
50	<li class="dropdown">	52	<li class="dropdown">
51	<a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown">	53	<a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown">
52	<span class="loggedinusername">[% loggedinusername %]</span>	54	<span id="logged-in-info-brief">
53	<span class="separator">\|</span>	55	<i class="fa fa-user"></i>
54	[% IF ( AutoLocation ) %]	56	</span>
55	<brand>	57	<span id="logged-in-info-full">
56	[% LoginBranchname %]	58	<span class="loggedinusername">[% loggedinusername %]</span>
57	</brand>	59	<span class="separator">\|</span>
58	[% ELSE %]	60	[% IF ( AutoLocation ) %]
59	<strong>	61	<brand>
60	[% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]	62	[% LoginBranchname %]
61	NO LIBRARY SET	63	</brand>
62	[% ELSE %]	64	[% ELSE %]
63	<span id="logged-in-branch-name">[% LoginBranchname %]</span>	65	<strong>
64	<span id="logged-in-branch-code" class="content_hidden">[% Branches.GetLoggedInBranchcode %]</span>	66	[% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
65	[% END %]	67	NO LIBRARY SET
66	</strong>	68	[% ELSE %]
67	[% END %]	69	<span id="logged-in-branch-name">[% LoginBranchname %]</span>
		70	<span id="logged-in-branch-code" class="content_hidden">[% Branches.GetLoggedInBranchcode %]</span>
		71	[% END %]
		72	</strong>
		73	[% END %]
		74	</span>
68	<b class="caret"></b>	75	<b class="caret"></b>
69	</a>	76	</a>
70	<ul class="dropdown-menu" role="menu" aria-labelledby="drop3">	77	<ul class="dropdown-menu" role="menu" aria-labelledby="drop3">
		78
		79	<li class="loggedin-menu-label">
		80	Logged in as:<br />
		81	<span class="loggedinusername">[% loggedinusername %]</span>
		82	</li>
		83	<li class="loggedin-menu-label">
		84	[% IF ( AutoLocation ) %]
		85	<brand>
		86	[% LoginBranchname %]
		87	</brand>
		88	[% ELSE %]
		89	[% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
		90	NO LIBRARY SET
		91	[% ELSE %]
		92	Location: <br />
		93	<span id="logged-in-branch-name">[% LoginBranchname %]</span>
		94	<span id="logged-in-branch-code" class="content_hidden">[% Branches.GetLoggedInBranchcode %]</span>
		95	[% END %]
		96	[% END %]
		97	</li>
		98
		99	<li role="separator" class="loggedin-menu-label divider"></li>
71	[% IF ( IndependentBranches ) %]	100	[% IF ( IndependentBranches ) %]
72	[% IF ( CAN_user_management \|\| CAN_user_editcatalogue_edit_catalogue ) %]	101	[% IF ( CAN_user_management \|\| CAN_user_editcatalogue_edit_catalogue ) %]
73	<li>	102	<li>
Lines 99-112 Link Here
99	</li>	128	</li>
100	[% INCLUDE 'langmenu-staff-top.inc' %]	129	[% INCLUDE 'langmenu-staff-top.inc' %]
101	<li>	130	<li>
102	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper">Help</a>	131	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
103	</li>	132	</li>
104	[% ELSE %]	133	[% ELSE %]
105	<li class="loggedout">	134	<li class="loggedout">
106	<span>	135	<span>
107	<a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>	136	<a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>
108	<span class="separator">\|</span>	137	<span class="separator">\|</span>
109	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper">Help</a>	138	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
110	</span>	139	</span>
111	</li>	140	</li>
112	[% END %]	141	[% END %]
113	-