diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml index e5e570f..173008c 100644 --- a/app/views/profile_editor/index.rhtml +++ b/app/views/profile_editor/index.rhtml @@ -6,13 +6,15 @@ <% control_panel do %> - <%= control_panel_button(_('Info and settings'), 'edit-profile', :controller => 'profile_editor', :action => 'edit') %> + <%= control_panel_button(_('Profile Info and settings'), 'edit-profile', :controller => 'profile_editor', :action => 'edit') if profile.person? %> + <%= control_panel_button(__('Community Info and settings'), 'edit-profile-group', :controller => 'profile_editor', :action => 'edit') if profile.community? %> + <%= control_panel_button(__('Enterprise Info Info and settings'), 'edit-profile-enterprise', :controller => 'profile_editor', :action => 'edit') if profile.enterprise? %> <%= control_panel_button(_('Mail settings'), 'mail', :controller => 'mailconf') if profile.person? && MailConf.enabled? %> <%= control_panel_button(_('Tasks'), 'todo', :controller => 'tasks', :action => 'index') %> - <%= control_panel_button(_('Edit sideboxes'), 'design-editor', :controller => 'profile_design', :action => 'index') %> + <%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %> <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'themes', :action => 'index') %> diff --git a/lib/zen3_terminology.rb b/lib/zen3_terminology.rb index d469aad..2ad4f4d 100644 --- a/lib/zen3_terminology.rb +++ b/lib/zen3_terminology.rb @@ -67,6 +67,7 @@ class Zen3Terminology < Noosfero::Terminology::Custom 'Create a new community' => N_('Create a new group'), 'Preferred domain name:' => N_('Choose your host community:'), 'My communities' => N_('My groups'), + 'Community Info and settings' => N_('Group Info and Settings'), }) end diff --git a/public/images/control-panel/Makefile b/public/images/control-panel/Makefile new file mode 100644 index 0000000..3a03653 --- /dev/null +++ b/public/images/control-panel/Makefile @@ -0,0 +1,13 @@ +PNGS = $(patsubst %.svg, %.png, $(wildcard *.svg)) +GIFS = $(patsubst %.svg, %.gif, $(wildcard *.svg)) + +%.png: %.svg + inkscape -w 48 -h 48 -e $@ $< + +%.gif : %.png + convert $< $@ + +all: $(GIFS) $(PNGS) + +clean: + rm -f $(GIFS) $(PNGS) diff --git a/public/images/control-panel/application-certificate.gif b/public/images/control-panel/application-certificate.gif new file mode 100644 index 0000000..745aee4 Binary files /dev/null and b/public/images/control-panel/application-certificate.gif differ diff --git a/public/images/control-panel/application-certificate.png b/public/images/control-panel/application-certificate.png new file mode 100644 index 0000000..8936758 Binary files /dev/null and b/public/images/control-panel/application-certificate.png differ diff --git a/public/images/control-panel/application-certificate.svg b/public/images/control-panel/application-certificate.svg new file mode 100644 index 0000000..077f741 --- /dev/null +++ b/public/images/control-panel/application-certificate.svg @@ -0,0 +1,443 @@ + + + + + + image/svg+xml + + + + + + CertificateJakub Steinercertificate + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/images/control-panel/blocks.gif b/public/images/control-panel/blocks.gif new file mode 100644 index 0000000..6eb69f2 Binary files /dev/null and b/public/images/control-panel/blocks.gif differ diff --git a/public/images/control-panel/blocks.png b/public/images/control-panel/blocks.png new file mode 100644 index 0000000..d2ef64b Binary files /dev/null and b/public/images/control-panel/blocks.png differ diff --git a/public/images/control-panel/blocks.svg b/public/images/control-panel/blocks.svg new file mode 100644 index 0000000..0f5c510 --- /dev/null +++ b/public/images/control-panel/blocks.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Justify Right + 2005-10-29 + + + Andreas Nilsson + + + + + justify + left + format + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/control-panel/contact.gif b/public/images/control-panel/contact.gif new file mode 100644 index 0000000..25c56b3 Binary files /dev/null and b/public/images/control-panel/contact.gif differ diff --git a/public/images/control-panel/contact.png b/public/images/control-panel/contact.png new file mode 100644 index 0000000..e85a140 Binary files /dev/null and b/public/images/control-panel/contact.png differ diff --git a/public/images/control-panel/contact.svg b/public/images/control-panel/contact.svg new file mode 100644 index 0000000..f20c4cb --- /dev/null +++ b/public/images/control-panel/contact.svg @@ -0,0 +1,795 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + New Contact + + + address + contact + e-mail + person + information + card + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Fulana + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Fulana + + diff --git a/public/images/control-panel/edit-profile-enterprise.gif b/public/images/control-panel/edit-profile-enterprise.gif new file mode 100644 index 0000000..f87d3fb Binary files /dev/null and b/public/images/control-panel/edit-profile-enterprise.gif differ diff --git a/public/images/control-panel/edit-profile-enterprise.png b/public/images/control-panel/edit-profile-enterprise.png new file mode 100644 index 0000000..39854d4 Binary files /dev/null and b/public/images/control-panel/edit-profile-enterprise.png differ diff --git a/public/images/control-panel/edit-profile-enterprise.svg b/public/images/control-panel/edit-profile-enterprise.svg new file mode 100644 index 0000000..5ad24c0 --- /dev/null +++ b/public/images/control-panel/edit-profile-enterprise.svg @@ -0,0 +1,549 @@ + +image/svg+xmlGo HomeJakub Steinerhttp://jimmac.musichall.czhomereturngodefaultuserdirectoryTuomas Kuosmanen + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/images/control-panel/edit-profile-group.gif b/public/images/control-panel/edit-profile-group.gif new file mode 100644 index 0000000..a3e5008 Binary files /dev/null and b/public/images/control-panel/edit-profile-group.gif differ diff --git a/public/images/control-panel/edit-profile-group.png b/public/images/control-panel/edit-profile-group.png new file mode 100644 index 0000000..0ca3a80 Binary files /dev/null and b/public/images/control-panel/edit-profile-group.png differ diff --git a/public/images/control-panel/edit-profile-group.svg b/public/images/control-panel/edit-profile-group.svg new file mode 100644 index 0000000..f7fc51d --- /dev/null +++ b/public/images/control-panel/edit-profile-group.svg @@ -0,0 +1,675 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + People + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + users + people + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/control-panel/edit-profile.gif b/public/images/control-panel/edit-profile.gif new file mode 100644 index 0000000..8de4ef0 Binary files /dev/null and b/public/images/control-panel/edit-profile.gif differ diff --git a/public/images/control-panel/edit-profile.png b/public/images/control-panel/edit-profile.png new file mode 100644 index 0000000..bf406c9 Binary files /dev/null and b/public/images/control-panel/edit-profile.png differ diff --git a/public/images/control-panel/edit-profile.svg b/public/images/control-panel/edit-profile.svg new file mode 100644 index 0000000..d5edfba --- /dev/null +++ b/public/images/control-panel/edit-profile.svg @@ -0,0 +1,590 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + People + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + users + people + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/control-panel/editpaste.gif b/public/images/control-panel/editpaste.gif new file mode 100644 index 0000000..534717f Binary files /dev/null and b/public/images/control-panel/editpaste.gif differ diff --git a/public/images/control-panel/editpaste.png b/public/images/control-panel/editpaste.png new file mode 100644 index 0000000..1116e53 Binary files /dev/null and b/public/images/control-panel/editpaste.png differ diff --git a/public/images/control-panel/editpaste.svg b/public/images/control-panel/editpaste.svg new file mode 120000 index 0000000..587b2f0 --- /dev/null +++ b/public/images/control-panel/editpaste.svg @@ -0,0 +1 @@ +/usr/share/icons/Tango/scalable/actions/editpaste.svg \ No newline at end of file diff --git a/public/images/control-panel/emblem-favorite.gif b/public/images/control-panel/emblem-favorite.gif new file mode 100644 index 0000000..37e3c8f Binary files /dev/null and b/public/images/control-panel/emblem-favorite.gif differ diff --git a/public/images/control-panel/emblem-favorite.png b/public/images/control-panel/emblem-favorite.png new file mode 100644 index 0000000..f17e861 Binary files /dev/null and b/public/images/control-panel/emblem-favorite.png differ diff --git a/public/images/control-panel/emblem-favorite.svg b/public/images/control-panel/emblem-favorite.svg new file mode 120000 index 0000000..d2c3e04 --- /dev/null +++ b/public/images/control-panel/emblem-favorite.svg @@ -0,0 +1 @@ +/usr/share/icons/Tango/scalable/emblems/emblem-favorite.svg \ No newline at end of file diff --git a/public/images/control-panel/header-footer.gif b/public/images/control-panel/header-footer.gif new file mode 100644 index 0000000..bf23f9f Binary files /dev/null and b/public/images/control-panel/header-footer.gif differ diff --git a/public/images/control-panel/header-footer.png b/public/images/control-panel/header-footer.png new file mode 100644 index 0000000..97b9be5 Binary files /dev/null and b/public/images/control-panel/header-footer.png differ diff --git a/public/images/control-panel/header-footer.svg b/public/images/control-panel/header-footer.svg new file mode 100644 index 0000000..901b275 --- /dev/null +++ b/public/images/control-panel/header-footer.svg @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Justify Right + 2005-10-29 + + + Andreas Nilsson + + + + + justify + left + format + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/control-panel/important.gif b/public/images/control-panel/important.gif new file mode 100644 index 0000000..c4d634b Binary files /dev/null and b/public/images/control-panel/important.gif differ diff --git a/public/images/control-panel/important.png b/public/images/control-panel/important.png new file mode 100644 index 0000000..a80d024 Binary files /dev/null and b/public/images/control-panel/important.png differ diff --git a/public/images/control-panel/important.svg b/public/images/control-panel/important.svg new file mode 120000 index 0000000..239577f --- /dev/null +++ b/public/images/control-panel/important.svg @@ -0,0 +1 @@ +/usr/share/icons/Tango/scalable/status/important.svg \ No newline at end of file diff --git a/public/images/control-panel/login.gif b/public/images/control-panel/login.gif new file mode 100644 index 0000000..019c78a Binary files /dev/null and b/public/images/control-panel/login.gif differ diff --git a/public/images/control-panel/login.png b/public/images/control-panel/login.png new file mode 100644 index 0000000..e40fa21 Binary files /dev/null and b/public/images/control-panel/login.png differ diff --git a/public/images/control-panel/login.svg b/public/images/control-panel/login.svg new file mode 120000 index 0000000..9ab1774 --- /dev/null +++ b/public/images/control-panel/login.svg @@ -0,0 +1 @@ +../../designs/icons/tango/Tango-mod/scalable/actions/login.svg \ No newline at end of file diff --git a/public/images/control-panel/package.gif b/public/images/control-panel/package.gif new file mode 100644 index 0000000..e14a2a7 Binary files /dev/null and b/public/images/control-panel/package.gif differ diff --git a/public/images/control-panel/package.png b/public/images/control-panel/package.png new file mode 100644 index 0000000..37c8365 Binary files /dev/null and b/public/images/control-panel/package.png differ diff --git a/public/images/control-panel/package.svg b/public/images/control-panel/package.svg new file mode 100644 index 0000000..47beed7 --- /dev/null +++ b/public/images/control-panel/package.svg @@ -0,0 +1,485 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Package + + + Jakub Steiner + + + http://jimmac.musichall.cz/ + + + package + archive + tarball + tar + bzip + gzip + zip + arj + tar + jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/control-panel/preferences-desktop-wallpaper.gif b/public/images/control-panel/preferences-desktop-wallpaper.gif new file mode 100644 index 0000000..1971a50 Binary files /dev/null and b/public/images/control-panel/preferences-desktop-wallpaper.gif differ diff --git a/public/images/control-panel/preferences-desktop-wallpaper.png b/public/images/control-panel/preferences-desktop-wallpaper.png new file mode 100644 index 0000000..79e76c7 Binary files /dev/null and b/public/images/control-panel/preferences-desktop-wallpaper.png differ diff --git a/public/images/control-panel/preferences-desktop-wallpaper.svg b/public/images/control-panel/preferences-desktop-wallpaper.svg new file mode 120000 index 0000000..7292175 --- /dev/null +++ b/public/images/control-panel/preferences-desktop-wallpaper.svg @@ -0,0 +1 @@ +/usr/share/icons/Tango/scalable/apps/preferences-desktop-wallpaper.svg \ No newline at end of file diff --git a/public/images/control-panel/stop.gif b/public/images/control-panel/stop.gif new file mode 100644 index 0000000..0b3cd56 Binary files /dev/null and b/public/images/control-panel/stop.gif differ diff --git a/public/images/control-panel/stop.png b/public/images/control-panel/stop.png new file mode 100644 index 0000000..6fe29db Binary files /dev/null and b/public/images/control-panel/stop.png differ diff --git a/public/images/control-panel/stop.svg b/public/images/control-panel/stop.svg new file mode 100644 index 0000000..04ce3a7 --- /dev/null +++ b/public/images/control-panel/stop.svg @@ -0,0 +1,336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Stop + 2005-10-16 + + + Andreas Nilsson + + + + + stop + halt + error + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + diff --git a/public/images/control-panel/system-file-manager.gif b/public/images/control-panel/system-file-manager.gif new file mode 100644 index 0000000..419c98c Binary files /dev/null and b/public/images/control-panel/system-file-manager.gif differ diff --git a/public/images/control-panel/system-file-manager.png b/public/images/control-panel/system-file-manager.png new file mode 100644 index 0000000..65a9c73 Binary files /dev/null and b/public/images/control-panel/system-file-manager.png differ diff --git a/public/images/control-panel/system-file-manager.svg b/public/images/control-panel/system-file-manager.svg new file mode 120000 index 0000000..a2bf4ff --- /dev/null +++ b/public/images/control-panel/system-file-manager.svg @@ -0,0 +1 @@ +/usr/share/icons/Tango/scalable/apps/system-file-manager.svg \ No newline at end of file diff --git a/public/images/control-panel/system-users.gif b/public/images/control-panel/system-users.gif new file mode 100644 index 0000000..c99fbb4 Binary files /dev/null and b/public/images/control-panel/system-users.gif differ diff --git a/public/images/control-panel/system-users.png b/public/images/control-panel/system-users.png new file mode 100644 index 0000000..33a3bec Binary files /dev/null and b/public/images/control-panel/system-users.png differ diff --git a/public/images/control-panel/system-users.svg b/public/images/control-panel/system-users.svg new file mode 120000 index 0000000..5b52232 --- /dev/null +++ b/public/images/control-panel/system-users.svg @@ -0,0 +1 @@ +/usr/share/icons/Tango/scalable/apps/system-users.svg \ No newline at end of file diff --git a/public/images/control-panel/text-editor-disabled.gif b/public/images/control-panel/text-editor-disabled.gif new file mode 100644 index 0000000..5b1a9f0 Binary files /dev/null and b/public/images/control-panel/text-editor-disabled.gif differ diff --git a/public/images/control-panel/text-editor-disabled.png b/public/images/control-panel/text-editor-disabled.png new file mode 100644 index 0000000..0a7094b Binary files /dev/null and b/public/images/control-panel/text-editor-disabled.png differ diff --git a/public/images/control-panel/text-editor-disabled.svg b/public/images/control-panel/text-editor-disabled.svg new file mode 100644 index 0000000..2071605 --- /dev/null +++ b/public/images/control-panel/text-editor-disabled.svg @@ -0,0 +1,799 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Text Editor + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/control-panel/text-editor.gif b/public/images/control-panel/text-editor.gif new file mode 100644 index 0000000..b923b13 Binary files /dev/null and b/public/images/control-panel/text-editor.gif differ diff --git a/public/images/control-panel/text-editor.png b/public/images/control-panel/text-editor.png new file mode 100644 index 0000000..bd26767 Binary files /dev/null and b/public/images/control-panel/text-editor.png differ diff --git a/public/images/control-panel/text-editor.svg b/public/images/control-panel/text-editor.svg new file mode 120000 index 0000000..117e78f --- /dev/null +++ b/public/images/control-panel/text-editor.svg @@ -0,0 +1 @@ +/usr/share/icons/Tango/scalable/apps/text-editor.svg \ No newline at end of file diff --git a/public/stylesheets/controller_profile_editor.css b/public/stylesheets/controller_profile_editor.css index 6cef6af..3a561a7 100644 --- a/public/stylesheets/controller_profile_editor.css +++ b/public/stylesheets/controller_profile_editor.css @@ -1,6 +1,6 @@ .control-panel { /*border: 1px solid red;*/ - padding: 0px 25px 0px 25px; + padding: 0px 15px 0px 15px; } .control-panel a { @@ -10,21 +10,77 @@ background-repeat: no-repeat; background-position: 0px 50%; height: 48px; - padding: 4px 10px 0px 50px; + padding: 4px 5px 0px 55px; + margin-bottom: 30px; + margin-right: 10px; text-align: left; text-decoration: none; font-weight: bold; color: black; /* default icon */ - background-image: url(../images/control-panel/system-users.png); + background-image: url(../images/control-panel/important.png); } .msie6 .control-panel a { - background-image: url(../images/control-panel/system-users.gif); + background-image: url(../images/control-panel/important.gif); } .control-panel a:hover { background-color: #d2e0f0; -moz-border-radius: 3px; } + +a.control-panel-groups { background-image: url(../images/control-panel/system-users.png) } +.msie6 a.control-panel-groups { background-image: url(../images/control-panel/system-users.gif) } + +a.control-panel-design-editor {background-image: url(../images/control-panel/preferences-desktop-wallpaper.png)} +.msie6 a.control-panel-design-editor {background-image: url(../images/control-panel/preferences-desktop-wallpaper.gif)} + +a.control-panel-blog-disabled {background-image: url(../images/control-panel/text-editor-disabled.png)} +.msie6 a.control-panel-blog-disabled {background-image: url(../images/control-panel/text-disabled.gif)} + +a.control-panel-blog {background-image: url(../images/control-panel/text-editor.png)} +.msie6 a.control-panel-blog {background-image: url(../images/control-panel/text.gif)} + +a.control-panel-change-password {background-image: url(../images/control-panel/login.png)} +.msie6 a.control-change-password {background-image: url(../images/control-panel/login.gif)} + +a.control-panel-cms {background-image: url(../images/control-panel/system-file-manager.png)} +.msie6 a.control-cms {background-image: url(../images/control-panel/system-file-manager.gif)} + +a.control-panel-favorites {background-image: url(../images/control-panel/emblem-favorite.png)} +.msie6 a.control-favorites {background-image: url(../images/control-panel/emblem-favorite.gif)} + +a.control-panel-todo {background-image: url(../images/control-panel/editpaste.png)} +.msie6 a.control-todo {background-image: url(../images/control-panel/editpaste.gif)} + +a.control-panel-blocks {background-image: url(../images/control-panel/blocks.png)} +.msie6 a.control-blocks {background-image: url(../images/control-panel/blocks.gif)} + +a.control-panel-header-and-footer {background-image: url(../images/control-panel/header-footer.png)} +.msie6 a.control-header-and-footer {background-image: url(../images/control-panel/header-footer.gif)} + +a.control-panel-friends {background-image: url(../images/control-panel/contact.png)} +.msie6 a.control-friends {background-image: url(../images/control-panel/contact.gif)} + +a.control-panel-edit-profile {background-image: url(../images/control-panel/edit-profile.png)} +.msie6 a.control-edit-profile {background-image: url(../images/control-panel/edit-profile.gif)} + +a.control-panel-edit-profile-group {background-image: url(../images/control-panel/edit-profile-group.png)} +.msie6 a.control-edit-profile-group {background-image: url(../images/control-panel/edit-profile-group.gif)} + +a.control-panel-edit-profile-enterprise {background-image: url(../images/control-panel/edit-profile-enterprise.png)} +.msie6 a.control-edit-profile-enterprise {background-image: url(../images/control-panel/edit-profile-enterprise.gif)} + +a.control-panel-members {background-image: url(../images/control-panel/contact.png)} +.msie6 a.control-members {background-image: url(../images/control-panel/contact.gif)} + +a.control-panel-products {background-image: url(../images/control-panel/package.png)} +.msie6 a.control-products {background-image: url(../images/control-panel/package.gif)} + +a.control-panel-disable {background-image: url(../images/control-panel/stop.png)} +.msie6 a.control-disable {background-image: url(../images/control-panel/stop.gif)} + +a.control-panel-validation {background-image: url(../images/control-panel/application-certificate.png)} +.msie6 a.control-validation {background-image: url(../images/control-panel/application-certificate.gif)} -- libgit2 0.21.2