bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge branch 'pull'

Browse source
This commit is contained in:
Friendika 2011-06-19 03:41:57 -07:00
commit fba2056b1f
8 changed files with 146 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
view/admin_aside.tpl
View file

@ -7,12 +7,11 @@
var register = $(data).find('register').text();
if (register=="0") { reigster=""; elm.hide();} else { elm.show(); }
elm.html(register);
console.log(elm, data, register);
});
});
</script>
<h4><a href="$admurl">Admin</a></h4>
<ul>
<ul class='admin linklist'>
<li class='admin link $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
<li class='admin link $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
<li class='admin link $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
@ -20,7 +19,7 @@
{{ if $admin.plugins_admin }}<h4>Plugins</h4>{{ endif }}
<ul>
<ul class='admin linklist'>
{{ for $admin.plugins_admin as $l }}
<li class='admin link $l.2'><a href='$l.0'>$l.1</a></li>
{{ endfor }}
@ -28,6 +27,6 @@
<h4>Logs</h4>
<ul>
<ul class='admin linklist'>
<li class='admin link $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
</ul>

2
view/admin_plugins.tpl
View file

@ -4,7 +4,7 @@
<ul id='pluginslist'>
{{ for $plugins as $p }}
<li class='plugin $p.1'>
<a class='toggleplugin' href='$baseurl/admin/plugins/$p.0?a=t'><span class='icon $p.1'></span></a>
<a class='toggleplugin' href='$baseurl/admin/plugins/$p.0?a=t' title="{{if $p.1==on }}Disable{{ else }}Enable{{ endif }}" ><span class='icon $p.1'></span></a>
<a href='$baseurl/admin/plugins/$p.0'><span class='name'>$p.2.name</span></a> - <span class="version">$p.2.version</span>
<div class='desc'>$p.2.description</div>
</li>

BIN
view/theme/dispy/icons.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 18 KiB

4
view/theme/dispy/jot-header.tpl
View file

@ -9,8 +9,8 @@ tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: /(profile-jot-text|prvmail-text)/,
plugins : "bbcode,paste",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
plugins : "bbcode,paste,fullscreen,autoresize",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",

2
view/theme/dispy/nav.tpl
View file

@ -2,6 +2,7 @@ $langselector
<span id="banner">$banner</span>
<a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
{{ if $nav.login }}<a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a> {{ endif }}
<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
@ -30,6 +31,7 @@ $langselector
{{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$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">$nav.admin.1</a></li>{{ endif }}
{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}

142
view/theme/dispy/style.css
View file

@ -138,14 +138,17 @@ nav .nav-link {
background: transparent url('icons.png') 0px 0px no-repeat;
}
#nav-directory-link { background-position: 0px -22px }
#nav-directory-link:hover { background-position: -22px -22px;}
#nav-search-link { background-position: 0px -44px }
#nav-search-link:hover { background-position: -22px -44px;}
#nav-apps-link { background-position: 0px -66px }
#nav-apps-link:hover { background-position: -22px -66px;}
#nav-login-link { background-position: 0px -88px }
#nav-login-link:hover { background-position: -22px -88px;}
#nav-directory-link { background-position: 0px -22px }
#nav-directory-link:hover { background-position: -22px -22px;}
#nav-search-link { background-position: 0px -44px }
#nav-search-link:hover { background-position: -22px -44px;}
#nav-apps-link { background-position: 0px -66px }
#nav-apps-link:hover { background-position: -22px -66px;}
#nav-login-link { background-position: 0px -88px }
#nav-login-link:hover { background-position: -22px -88px;}
#nav-help-link { background-position: 0px -110px }
#nav-help-link:hover { background-position: -22px -110px;}
#notifications {
height: 20px; width: 100%;
@ -248,6 +251,11 @@ aside #viewcontacts { text-align: right;}
padding: 0.2em 0.5em;
}
#netsearch-box {
margin: 30px 0px;
}
/**
* contacts block
*/
@ -484,6 +492,9 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.wall-item-photo-menu li a { white-space: nowrap; display: block; padding: 5px 2px; color: #eeeeec; }
.wall-item-photo-menu li a:hover { color: #555753; background: #eeeeec; }
.icon.drop,
.icon.drophide { float: left; }
#item-delete-selected { overflow: auto; width: 100%}
/**
* comment
*/
@ -537,6 +548,16 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
border: 0px;
}
/**
* item text style
**/
.wall-item-body code {
border-color: #CCCCCC;
border-style: solid;
border-width: 1px 1px 1px 10px;
display: block;
padding-left: 10px;
}
@ -779,6 +800,93 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
*/
.directory-item {float: left; margin: 50px 50px 0px 0px;}
/**
* ADMIN
*/
#pending-update {
float:right;
color: #ffffff;
font-weight: bold;
background-color: #FF0000;
padding: 0em 0.3em;
}
.admin.linklist {
border: 0px; padding: 0px;
}
.admin.link {
list-style-position: inside;
}
#adminpage dl {
clear: left;
margin-bottom: 2px;
padding-bottom: 2px;
border-bottom: 1px solid black;
}
#adminpage dt {
width: 200px;
float: left;
font-weight: bold;
}
#adminpage dd {
margin-left: 200px;
}
#adminpage .field {
clear: left;
margin-bottom: 5px;
padding-bottom: 5px;
}
#adminpage .field label {
float: left;
width: 200px;
font-weight: bold;
}
#adminpage .field input,
#adminpage .field textarea {
width: 400px;
}
#adminpage .field textarea { height: 100px; }
#adminpage .field_help {
display: block;
margin-left: 200px;
color: #666666;
}
#adminpage h3 {
border-bottom: 1px solid #cccccc;
}
#adminpage .submit {
clear:left;
}
#adminpage #pluginslist {
margin: 0px; padding: 0px;
}
#adminpage .plugin {
list-style: none;
display: block;
border: 1px solid #888888;
padding: 1em;
margin-bottom: 5px;
clear: left;
}
#adminpage .toggleplugin {
float:left;
margin-right: 1em;
}
#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
#adminpage table th { text-align: left;}
#adminpage td .icon { float: left;}
#adminpage table#users img { width: 16px; height: 16px; }
#adminpage table tr:hover { background-color: #bbc7d7; }
#adminpage .selectall { text-align: right; }
/**
* ICONS
*/
@ -829,16 +937,24 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.attach { background-position: -190px -40px;}
.language { background-position: -210px -40px;}
.on { background-position: -50px -60px;}
.off { background-position: -70px -60px;}
.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
.attachtype {
display: block; width: 20px; height: 23px;
background-image: url('../../../images/content-types.png');
}
.type-video { background-position: 0px; 0px; }
.type-image { background-position: -20px; 0px; }
.type-audio { background-position: -40px; 0px; }
.type-text { background-position: -60px; 0px; }
.type-unkn { background-position: -80px; 0px; }
.type-video { background-position: 0px 0px; }
.type-image { background-position: -20px 0px; }
.type-audio { background-position: -40px 0px; }
.type-text { background-position: -60px 0px; }
.type-unkn { background-position: -80px 0px; }

2
view/theme/duepuntozero/style.css
View file

@ -104,7 +104,7 @@ nav #site-location {
nav #banner {
display: block;
padding-top: 14px;
margin-top: 14px;
position: absolute;
}
nav #banner #logo-text a {

9
view/theme/loozah/style.css
View file

@ -2556,6 +2556,13 @@ a.mail-list-link {
/**
* ADMIN
*/
#pending-update {
float:right;
color: #ffffff;
font-weight: bold;
background-color: #FF0000;
padding: 0em 0.3em;
}
#adminpage dl {
clear: left;
@ -2615,7 +2622,7 @@ a.mail-list-link {
margin-bottom: 5px;
clear: left;
}
#adminpage .plugin .toggle {
#adminpage .toggleplugin {
float:left;
margin-right: 1em;
}