Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
0d0f129d04
|
|
@ -719,14 +719,18 @@
|
|||
if ($page<0) $page=0;
|
||||
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
|
||||
$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
|
||||
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||
|
||||
$start = $page*$count;
|
||||
|
||||
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
||||
|
||||
$sql_extra = '';
|
||||
if ($max_id > 0)
|
||||
$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
|
||||
$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
|
||||
if ($exclude_replies > 0)
|
||||
$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
|
||||
|
||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||
|
|
@ -1061,11 +1065,14 @@
|
|||
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
|
||||
if ($page<0) $page=0;
|
||||
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||
$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
|
||||
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||
|
||||
$start = $page*$count;
|
||||
|
||||
if ($user_info['self']==1) $sql_extra = "AND `item`.`wall` = 1 ";
|
||||
$sql_extra = '';
|
||||
if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 ";
|
||||
if ($exclude_replies > 0) $sql_extra .= ' AND `item`.`parent` = `item`.`id`';
|
||||
|
||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 28 KiB |
|
|
@ -14,9 +14,9 @@
|
|||
height="200"
|
||||
id="svg3403"
|
||||
version="1.1"
|
||||
inkscape:version="0.48+devel r"
|
||||
inkscape:version="0.48.3.1 r9886"
|
||||
sodipodi:docname="icons.svg"
|
||||
inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy-dark/icons.png"
|
||||
inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/dark/icons.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90">
|
||||
<defs
|
||||
|
|
@ -52,8 +52,8 @@
|
|||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.9403009"
|
||||
inkscape:cx="95.950174"
|
||||
inkscape:cy="115.58345"
|
||||
inkscape:cx="127.81563"
|
||||
inkscape:cy="128.63003"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="true"
|
||||
|
|
@ -1127,16 +1127,16 @@
|
|||
inkscape:connector-curvature="0"
|
||||
id="path4319"
|
||||
d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
|
||||
style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4321"
|
||||
d="m -44.467884,1124.9404 4.644661,0"
|
||||
style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
|
||||
<path
|
||||
style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
d="m -42.239747,1107.2336 0,17.6813"
|
||||
id="path4323"
|
||||
inkscape:connector-curvature="0"
|
||||
|
|
@ -1146,7 +1146,7 @@
|
|||
inkscape:connector-curvature="0"
|
||||
id="path4325"
|
||||
d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
|
||||
style="fill:#999999;stroke:#999999;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
style="fill:#999999;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
|
||||
<rect
|
||||
ry="0.42804927"
|
||||
|
|
@ -1156,7 +1156,7 @@
|
|||
height="1.8614606"
|
||||
width="5.1800866"
|
||||
id="rect4327"
|
||||
style="fill:#999999;fill-opacity:1;stroke:#999999"
|
||||
style="fill:#999999;fill-opacity:1;stroke:#e6e6e6"
|
||||
transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
|
||||
<path
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 120 KiB |
|
|
@ -78,16 +78,19 @@ h6{font-size:xx-small;}
|
|||
#login_openid label{width:180px !important;}
|
||||
nav{height:60px;background-color:#1d1f1d;color:#eeeeee;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeee;border:0px;}nav a:hover{text-decoration:none;color:#eeeeee;border:0px;}
|
||||
nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;}
|
||||
ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeee;background-color:#555753;}ul#user-menu-popup li a:hover{color:#2e2f2e;background-color:#eeeeee;}
|
||||
#site-location{font-weight:bold;font-style:italic;font-size:small;width:30em;position:relative;left:-3.5em;top:3em;}
|
||||
ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:3px 0 0;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeee;background-color:#555753;}ul#user-menu-popup li a:hover{color:#2e2f2e;background-color:#eeeeee;}
|
||||
ul#user-menu-popup li a.nav-sep{border-top:1px solid #2e302e;}
|
||||
nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(dark/icons.png) 0 0 no-repeat;}
|
||||
#nav-admin-link{background-position:0 -154px;}#nav-admin-link:hover{background-position:-22px -154px;}
|
||||
#nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;}
|
||||
#nav-community-link,#nav-contacts-link{background-position:0 -22px;}#nav-community-link:hover,#nav-contacts-link:hover{background-position:-22px -22px;}
|
||||
#nav-directory-link{background-position:-44px -154px;}#nav-directory-link:hover{background-position:-66px -154px;}
|
||||
#nav-help-link{background-position:0 -110px;}#nav-help-link:hover{background-position:-22px -110px;}
|
||||
#nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
|
||||
#nav-intro-link{background-position:0px -190px;}#nav-intro-link:hover{background-position:-44px -190px;}
|
||||
#nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;}
|
||||
#nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
|
||||
#nav-manage-link{background-position:0px -22px;}#nav-manage-link:hover{background-position:-22px -22px;}
|
||||
#nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
|
||||
#nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
|
||||
#nav-notify-link:hover{background-position:-66px -110px;}
|
||||
|
|
@ -105,14 +108,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
|
||||
#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;}
|
||||
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
|
||||
#nav-buttons-2{clear:both;list-style:none;padding:0px;margin:0px;left:136px;top:-20px;position:relative;width:6em;height:25px;}#nav-buttons-2>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
|
||||
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
|
||||
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
||||
#search-text,#mini-search-text{background:white;color:#2e2f2e;}
|
||||
#search-text{border:1px solid #eeeeee;margin:5px 0;}
|
||||
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
|
||||
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
|
||||
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:80%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
|
||||
#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
|
||||
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:35%;margin:5px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;top:4px;left:7px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
|
||||
#user-menu-label{font-size:small;padding:0px 20px 10px 5px;height:10px;display:block;}
|
||||
.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
|
||||
.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
|
||||
#net-update{background-position:0px 0px;}
|
||||
|
|
|
|||
|
|
@ -445,13 +445,22 @@ nav {
|
|||
font-weight: bold;
|
||||
margin-left: 3px; } }
|
||||
}
|
||||
#site-location {
|
||||
font-weight: bold;
|
||||
font-style: italic;
|
||||
font-size: small;
|
||||
width: 30em;
|
||||
position: relative;
|
||||
left: -3.5em;
|
||||
top: 3em;
|
||||
}
|
||||
ul#user-menu-popup {
|
||||
display: none;
|
||||
position: absolute;
|
||||
background-color: @menu_bg_colour;
|
||||
width: 100%;
|
||||
padding: 10px 0px;
|
||||
margin: 0px;
|
||||
margin: 3px 0 0;
|
||||
top: 20px;
|
||||
left: 0;
|
||||
font-size: small;
|
||||
|
|
@ -481,6 +490,12 @@ nav .nav-link {
|
|||
text-indent: 50px;
|
||||
background: transparent url(dark/icons.png) 0 0 no-repeat;
|
||||
}
|
||||
#nav-admin-link {
|
||||
background-position: 0 -154px;
|
||||
&:hover {
|
||||
background-position: -22px -154px;
|
||||
}
|
||||
}
|
||||
#nav-apps-link {
|
||||
background-position: 0 -66px;
|
||||
&:hover {
|
||||
|
|
@ -513,9 +528,9 @@ nav .nav-link {
|
|||
}
|
||||
}
|
||||
#nav-intro-link {
|
||||
background-position: 0px -190px;
|
||||
background-position: 0px -88px;
|
||||
&:hover {
|
||||
background-position: -44px -190px;
|
||||
background-position: -22px -88px;
|
||||
}
|
||||
}
|
||||
#nav-login-link,
|
||||
|
|
@ -525,6 +540,12 @@ nav .nav-link {
|
|||
background-position: -22px -88px;
|
||||
}
|
||||
}
|
||||
#nav-manage-link {
|
||||
background-position: 0px -22px;
|
||||
&:hover {
|
||||
background-position: -22px -22px;
|
||||
}
|
||||
}
|
||||
#nav-messages-link {
|
||||
background-position: -44px -88px;
|
||||
&:hover {
|
||||
|
|
@ -653,6 +674,21 @@ nav #nav-notifications-linkmenu {
|
|||
margin: 0px -4px 0px 0px;
|
||||
}
|
||||
}
|
||||
#nav-buttons-2 {
|
||||
clear: both;
|
||||
list-style: none;
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
left: 136px;
|
||||
top: -20px;
|
||||
position: relative;
|
||||
.box(6em, 25px);
|
||||
> li {
|
||||
padding: 0;
|
||||
display: inline-block;
|
||||
margin: 0px -4px 0px 0px;
|
||||
}
|
||||
}
|
||||
.floaterflip {
|
||||
display: block;
|
||||
position: fixed;
|
||||
|
|
@ -702,17 +738,17 @@ nav #nav-notifications-linkmenu {
|
|||
#user-menu {
|
||||
.box_shadow(5px, 0, 10px, 0);
|
||||
display: block;
|
||||
width: 80%;
|
||||
margin: 3px 0 0 0;
|
||||
width: 35%;
|
||||
margin: 5px 0 0 0;
|
||||
position: relative;
|
||||
.rounded_corners;
|
||||
background-color: @menu_bg_colour;
|
||||
background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");
|
||||
background-position: 98% center;
|
||||
background-repeat: no-repeat;
|
||||
clear: both;
|
||||
/* clear: both;*/
|
||||
top: 4px;
|
||||
left: 10px;
|
||||
left: 7px;
|
||||
padding: 2px;
|
||||
> a {
|
||||
vertical-align: top;
|
||||
|
|
@ -721,8 +757,9 @@ nav #nav-notifications-linkmenu {
|
|||
}
|
||||
#user-menu-label {
|
||||
font-size: small;
|
||||
padding: 3px 20px 9px 5px;
|
||||
padding: 0px 20px 10px 5px;
|
||||
height: 10px;
|
||||
display: block;
|
||||
}
|
||||
.nav-ajax-update,
|
||||
.nav-ajax-left {
|
||||
|
|
|
|||
|
|
@ -78,16 +78,19 @@ h6{font-size:xx-small;}
|
|||
#login_openid label{width:180px !important;}
|
||||
nav{height:60px;background-color:#2e3436;color:#eeeeec;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeec;border:0px;}nav a:hover{text-decoration:none;color:#eeeeec;border:0px;}
|
||||
nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;}
|
||||
ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeec;background-color:#555753;}ul#user-menu-popup li a:hover{color:#eeeeec;background-color:#111111;}
|
||||
#site-location{font-weight:bold;font-style:italic;font-size:small;width:30em;position:relative;left:-3.5em;top:3em;}
|
||||
ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:3px 0 0;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeec;background-color:#555753;}ul#user-menu-popup li a:hover{color:#eeeeec;background-color:#111111;}
|
||||
ul#user-menu-popup li a.nav-sep{border-top:1px solid #2e302e;}
|
||||
nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(light/icons.png) 0 0 no-repeat;}
|
||||
#nav-admin-link{background-position:0 -154px;}#nav-admin-link:hover{background-position:-22px -154px;}
|
||||
#nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;}
|
||||
#nav-community-link,#nav-contacts-link{background-position:0 -22px;}#nav-community-link:hover,#nav-contacts-link:hover{background-position:-22px -22px;}
|
||||
#nav-directory-link{background-position:-44px -154px;}#nav-directory-link:hover{background-position:-66px -154px;}
|
||||
#nav-help-link{background-position:0 -110px;}#nav-help-link:hover{background-position:-22px -110px;}
|
||||
#nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
|
||||
#nav-intro-link{background-position:0px -190px;}#nav-intro-link:hover{background-position:-44px -190px;}
|
||||
#nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;}
|
||||
#nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
|
||||
#nav-manage-link{background-position:0px -22px;}#nav-manage-link:hover{background-position:-22px -22px;}
|
||||
#nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
|
||||
#nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
|
||||
#nav-notify-link:hover{background-position:-66px -110px;}
|
||||
|
|
@ -105,14 +108,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
|
||||
#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#2e3436;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;}
|
||||
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
|
||||
#nav-buttons-2{clear:both;list-style:none;padding:0px;margin:0px;left:136px;top:-20px;position:relative;width:6em;height:25px;}#nav-buttons-2>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
|
||||
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;}
|
||||
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
||||
#search-text,#mini-search-text{background:white;color:#111111;}
|
||||
#search-text{border:1px solid #999999;margin:5px 0;}
|
||||
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
|
||||
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
|
||||
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:80%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
|
||||
#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
|
||||
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:35%;margin:5px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;top:4px;left:7px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
|
||||
#user-menu-label{font-size:small;padding:0px 20px 10px 5px;height:10px;display:block;}
|
||||
.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(light/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
|
||||
.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
|
||||
#net-update{background-position:0px 0px;}
|
||||
|
|
|
|||
|
|
@ -446,13 +446,22 @@ nav {
|
|||
font-weight: bold;
|
||||
margin-left: 3px; } }
|
||||
}
|
||||
#site-location {
|
||||
font-weight: bold;
|
||||
font-style: italic;
|
||||
font-size: small;
|
||||
width: 30em;
|
||||
position: relative;
|
||||
left: -3.5em;
|
||||
top: 3em;
|
||||
}
|
||||
ul#user-menu-popup {
|
||||
display: none;
|
||||
position: absolute;
|
||||
background-color: @menu_bg_colour;
|
||||
width: 100%;
|
||||
padding: 10px 0px;
|
||||
margin: 0px;
|
||||
margin: 3px 0 0;
|
||||
top: 20px;
|
||||
left: 0;
|
||||
font-size: small;
|
||||
|
|
@ -482,6 +491,12 @@ nav .nav-link {
|
|||
text-indent: 50px;
|
||||
background: transparent url(light/icons.png) 0 0 no-repeat;
|
||||
}
|
||||
#nav-admin-link {
|
||||
background-position: 0 -154px;
|
||||
&:hover {
|
||||
background-position: -22px -154px;
|
||||
}
|
||||
}
|
||||
#nav-apps-link {
|
||||
background-position: 0 -66px;
|
||||
&:hover {
|
||||
|
|
@ -514,9 +529,9 @@ nav .nav-link {
|
|||
}
|
||||
}
|
||||
#nav-intro-link {
|
||||
background-position: 0px -190px;
|
||||
background-position: 0px -88px;
|
||||
&:hover {
|
||||
background-position: -44px -190px;
|
||||
background-position: -22px -88px;
|
||||
}
|
||||
}
|
||||
#nav-login-link,
|
||||
|
|
@ -526,6 +541,12 @@ nav .nav-link {
|
|||
background-position: -22px -88px;
|
||||
}
|
||||
}
|
||||
#nav-manage-link {
|
||||
background-position: 0px -22px;
|
||||
&:hover {
|
||||
background-position: -22px -22px;
|
||||
}
|
||||
}
|
||||
#nav-messages-link {
|
||||
background-position: -44px -88px;
|
||||
&:hover {
|
||||
|
|
@ -654,6 +675,21 @@ nav #nav-notifications-linkmenu {
|
|||
margin: 0px -4px 0px 0px;
|
||||
}
|
||||
}
|
||||
#nav-buttons-2 {
|
||||
clear: both;
|
||||
list-style: none;
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
left: 136px;
|
||||
top: -20px;
|
||||
position: relative;
|
||||
.box(6em, 25px);
|
||||
> li {
|
||||
padding: 0;
|
||||
display: inline-block;
|
||||
margin: 0px -4px 0px 0px;
|
||||
}
|
||||
}
|
||||
.floaterflip {
|
||||
display: block;
|
||||
position: fixed;
|
||||
|
|
@ -703,17 +739,17 @@ nav #nav-notifications-linkmenu {
|
|||
#user-menu {
|
||||
.box_shadow(5px, 0, 10px, 0);
|
||||
display: block;
|
||||
width: 80%;
|
||||
margin: 3px 0 0 0;
|
||||
width: 35%;
|
||||
margin: 5px 0 0 0;
|
||||
position: relative;
|
||||
.rounded_corners;
|
||||
background-color: @menu_bg_colour;
|
||||
background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");
|
||||
background-position: 98% center;
|
||||
background-repeat: no-repeat;
|
||||
clear: both;
|
||||
/* clear: both;*/
|
||||
top: 4px;
|
||||
left: 10px;
|
||||
left: 7px;
|
||||
padding: 2px;
|
||||
> a {
|
||||
vertical-align: top;
|
||||
|
|
@ -722,8 +758,9 @@ nav #nav-notifications-linkmenu {
|
|||
}
|
||||
#user-menu-label {
|
||||
font-size: small;
|
||||
padding: 3px 20px 9px 5px;
|
||||
padding: 0px 20px 10px 5px;
|
||||
height: 10px;
|
||||
display: block;
|
||||
}
|
||||
.nav-ajax-update,
|
||||
.nav-ajax-left {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<nav id="pagenav">
|
||||
|
||||
<span id="banner">$banner</span>
|
||||
<div id="banner">$banner</div>
|
||||
<div id="site-location">$sitelocation</div>
|
||||
|
||||
<a name="top" id="top"></a>
|
||||
<div id="nav-floater">
|
||||
|
|
@ -50,7 +51,7 @@
|
|||
</ul>
|
||||
|
||||
<div id="user-menu">
|
||||
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="$nav.home.0">$sitelocation</a>
|
||||
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="$nav.home.0"><span class="">User Menu</span></a>
|
||||
<ul id="user-menu-popup"
|
||||
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
|
||||
onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
|
||||
|
|
@ -62,9 +63,6 @@
|
|||
{{ endif }}
|
||||
{{ if $nav.contacts }}
|
||||
<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
|
||||
{{ endif }}
|
||||
{{ if $nav.introductions }}
|
||||
<li><a id="nav-intro-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li>
|
||||
{{ endif }}
|
||||
{{ if $nav.profiles }}
|
||||
<li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li>
|
||||
|
|
@ -72,12 +70,6 @@
|
|||
{{ if $nav.settings }}
|
||||
<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0" title="$nav.settings.1">$nav.settings.1</a></li>
|
||||
{{ endif }}
|
||||
{{ if $nav.manage }}
|
||||
<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
|
||||
{{ endif }}
|
||||
{{ if $nav.admin }}
|
||||
<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
|
||||
{{ endif }}
|
||||
{{ if $nav.login }}
|
||||
<li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
|
||||
{{ endif }}
|
||||
|
|
@ -87,6 +79,18 @@
|
|||
</ul>
|
||||
</div>
|
||||
|
||||
<ul id="nav-buttons-2">
|
||||
{{ if $nav.introductions }}
|
||||
<li><a id="nav-intro-link" class="nav-link $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li>
|
||||
{{ endif }}
|
||||
{{ if $nav.admin }}
|
||||
<li><a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
|
||||
{{ endif }}
|
||||
{{ if $nav.manage }}
|
||||
<li><a id="nav-manage-link" class="nav-link $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
|
||||
{{ endif }}
|
||||
</ul>
|
||||
|
||||
{{ if $userinfo }}
|
||||
<ul id="nav-user-menu" class="menu-popup">
|
||||
{{ for $nav.usermenu as $usermenu }}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user