openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 56f0293565bb284acd827ce0e2626fd594fdb20a
parent 7d55aefa5cb7db1b3a30e24148520533b22c6103
Author: Jan Dankert <devnull@localhost>
Date:   Wed, 31 Oct 2012 20:26:59 +0100

Zusammenführen

Diffstat:
build.ini | 8++++----
language/de.ini.php | 5+++++
themes/default/js/plugin/jquery-plugin-orAutoheight.js | 23+++++++++++++++++++++++
themes/default/templates/profile/edit.tpl.src.xml | 13++++++++-----
themes/default/templates/profile/settings.tpl.src.xml | 52+++++++++++++++++++++-------------------------------
themes/default/templates/title/show.tpl.src.xml | 2+-
6 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/build.ini b/build.ini @@ -1,5 +1,5 @@ ; auto-generated by /home/dankert/bin/openrat-increment-build - do not change -build=937 -date="Tue, 30 Oct 2012 21:03:30 +0100" -message="Prepare for build number 936" -changeset=71c8b143f99c +build=938 +date="Tue, 30 Oct 2012 23:32:43 +0100" +message="Titelleiste" +changeset=0d362898215f diff --git a/language/de.ini.php b/language/de.ini.php @@ -1163,3 +1163,8 @@ USER_YOURPROFILE = "Persönliche Einstellungen" VALUE = Inhalt WEEK="Woche" WINDOW_FULLSCREEN="Vollbild" +MENU_STRUCTURE_DESC="Struktur anzeigen" +MENU_PREVIEW_DESC="Vorschau" +MENU_ARCHIVE_DESC="Archiv anzeigen" +MENU_USERTIMELINE_DESC="Meine letzten Änderungen" +MENU_OPENID_DESC="Anmeldung über Ihre Open-Id-Kennung" diff --git a/themes/default/js/plugin/jquery-plugin-orAutoheight.js b/themes/default/js/plugin/jquery-plugin-orAutoheight.js @@ -0,0 +1,22 @@ +/** + * Input-Hints + */ +jQuery.fn.orAutoheight = function() +{ + + var resize = function( element ) + { + var lines = $(element).val().split("\n").length; + $(element).attr('rows',lines+3); + }; + + $(this).each(function(i) + { + resize(this); + }); + + return $(this).keypress(function() + { + resize(this); + }); +};+ \ No newline at end of file diff --git a/themes/default/templates/profile/edit.tpl.src.xml b/themes/default/templates/profile/edit.tpl.src.xml @@ -18,11 +18,14 @@ <label for="mail" key="user_mail"></label> </part> <part class="input"> - <text var="mail" class="filename"></text> - <newline></newline> - <link type="view" class="action" action="profile" subaction="mail"> - <text key="edit"></text> - </link> + <text var="mail"></text> + <newline /> + <newline /> + <part class="clickable"> + <link type="view" class="action" action="profile" subaction="mail"> + <text key="edit"></text> + </link> + </part> </part> </part> </group> diff --git a/themes/default/templates/profile/settings.tpl.src.xml b/themes/default/templates/profile/settings.tpl.src.xml @@ -1,36 +1,26 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <form method="post"> -<table> - <row> - <column> - <group title="message:settings"> - <part> - <checkbox name="always_edit"></checkbox> - <label for="always_edit"><text key="setting_always_edit"></text> - </label> - </part> - <part> - <checkbox name="ignore_ok_notices"></checkbox> - <label for="ignore_ok_notices"> - <text key="setting_ignore_ok_notices"></text> - </label> - </part> - </group> - <group title="message:timezone"> - <selectbox name="timezone_offset" list="timezone_list" - addempty="true"></selectbox> - </group> - <group title="message:language"> - <selectbox name="language" list="language_list" addempty="true"></selectbox> - </group> - </column> - </row> - <row> - <column colspan="2" class="act"> - <button type="ok"></button> - </column> - </row> -</table> + <part class="line"> + <part class="label"> + <label for="timezone_offset"> + <text key="timezone" /> + </label> + </part> + <part class="input"> + <selectbox name="timezone_offset" list="timezone_list" + addempty="true"></selectbox> + </part> + </part> + <part class="line"> + <part class="label"> + <label for=""> + <text key="language" /> + </label> + </part> + <part class="input"> + <selectbox name="language" list="language_list" addempty="true"></selectbox> + </part> + </part> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/title/show.tpl.src.xml b/themes/default/templates/title/show.tpl.src.xml @@ -63,7 +63,7 @@ <part class="projects"> <image icon="project" align="left"></image> - <text class="titletext" key="GLOBAL_CHANGE_TO"></text> + <text class="titletext" key="GLOBAL_PROJECTS"></text> <part class="dropdown"> <list list="projects" key="id" value="name"> <part class="entry clickable">