diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-23 18:25:14 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-23 18:25:14 -0400 |
| commit | 6e9485605f64394f8e6d830b8a959a5afc85cf2d (patch) | |
| tree | 7f94f8d1e2336bbb7e69a327a003b6880f0610c0 /view/theme/diabook/diabook-green/right_aside.tpl | |
| parent | 29d7f260d7e6dc178862c6a6c16445ef9b3512e4 (diff) | |
| parent | af7abcea2715824cbd6460a7323c8bb64bd5b829 (diff) | |
| download | volse-hubzilla-6e9485605f64394f8e6d830b8a959a5afc85cf2d.tar.gz volse-hubzilla-6e9485605f64394f8e6d830b8a959a5afc85cf2d.tar.bz2 volse-hubzilla-6e9485605f64394f8e6d830b8a959a5afc85cf2d.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
DE strings, correction of a typo
diabok-themes: fixed bug in green-wide and dark-wide
diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
diabook-themes: bugfix in admin-section
allow bbcode representation of html symbols such as © by wrapping in bb brackets
protect jappixmini/proxy from typo check, more work on email2 connector
* master:
Diffstat (limited to 'view/theme/diabook/diabook-green/right_aside.tpl')
| -rw-r--r-- | view/theme/diabook/diabook-green/right_aside.tpl | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/view/theme/diabook/diabook-green/right_aside.tpl b/view/theme/diabook/diabook-green/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-green/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ -<div id="profile_side"> - <div id="ps-usernameicon"> - <a href="$ps.usermenu.status.0" title="$userinfo.name"> - <img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name"> - </a> - <a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a> - </div> - -<ul id="profile-side-menu" class="menu-profile-side"> - <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> - <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> - <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> - <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> - <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li> - <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li> -</ul> - -</div> - -
\ No newline at end of file |