diff options
Diffstat (limited to 'view')
-rw-r--r-- | view/api_timeline_xml.tpl | 42 | ||||
-rw-r--r-- | view/api_user_xml.tpl | 64 | ||||
-rw-r--r-- | view/de/strings.php | 2 | ||||
-rw-r--r-- | view/theme/diabook-aerith/style-network.css | 3 | ||||
-rw-r--r-- | view/theme/diabook-aerith/style-profile.css | 3 | ||||
-rw-r--r-- | view/theme/diabook-aerith/style.css | 10 | ||||
-rw-r--r-- | view/theme/diabook-blue/style-network.css | 3 | ||||
-rw-r--r-- | view/theme/diabook-blue/style-profile.css | 3 | ||||
-rw-r--r-- | view/theme/diabook-blue/style.css | 10 | ||||
-rw-r--r-- | view/theme/diabook-red/style-network.css | 3 | ||||
-rw-r--r-- | view/theme/diabook-red/style-profile.css | 3 | ||||
-rw-r--r-- | view/theme/diabook-red/style.css | 10 | ||||
-rw-r--r-- | view/theme/diabook/js/README | 6 | ||||
-rw-r--r-- | view/theme/diabook/style-network-wide.css | 11 | ||||
-rw-r--r-- | view/theme/diabook/style-network.css | 3 | ||||
-rw-r--r-- | view/theme/diabook/style-profile-wide.css | 11 | ||||
-rw-r--r-- | view/theme/diabook/style-profile.css | 3 | ||||
-rw-r--r-- | view/theme/diabook/style-wide.css | 18 | ||||
-rw-r--r-- | view/theme/diabook/style.css | 10 | ||||
-rw-r--r-- | view/theme/duepuntozero/lang_selector.tpl | 10 |
20 files changed, 150 insertions, 78 deletions
diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl index 17860ca61..4a32b411b 100644 --- a/view/api_timeline_xml.tpl +++ b/view/api_timeline_xml.tpl @@ -1,22 +1,20 @@ -<statuses type="array"> - {{ for $statuses as $status }} - <status> - <created_at>$status.created_at</created_at> - <id>$status.id</id> - <text>$status.text</text> - <statusnet_html>$status.statusnet_html</statusnet_html> - <source>$status.source</source> - <truncated>$status.truncated</truncated> - <url>$status.url</url> - <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id> - <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id> - <favorited>$status.favorited</favorited> - <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name> - <geo>$status.geo</geo> - <coordinates>$status.coordinates</coordinates> - <place>$status.place</place> - <contributors>$status.contributors</contributors> - {{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} - </status> - {{ endfor }} -</statuses>
\ No newline at end of file +<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/"> +{{ for $statuses as $status }} <status> + <text>$status.text</text> + <truncated>$status.truncated</truncated> + <created_at>$status.created_at</created_at> + <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id> + <source>$status.source</source> + <id>$status.id</id> + <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id> + <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name> + <geo>$status.geo</geo> + <favorited>$status.favorited</favorited> +{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} <statusnet:html>$status.statusnet_html</statusnet:html> + <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id> + <url>$status.url</url> + <coordinates>$status.coordinates</coordinates> + <place>$status.place</place> + <contributors>$status.contributors</contributors> + </status> +{{ endfor }}</statuses> diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl index f1e122f3e..d286652c0 100644 --- a/view/api_user_xml.tpl +++ b/view/api_user_xml.tpl @@ -1,34 +1,34 @@ -<user> - <id>$user.id</id> - <name>$user.name</name> - <screen_name>$user.screen_name</screen_name> - <location>$user.location</location> - <description>$user.description</description> - <profile_image_url>$user.profile_image_url</profile_image_url> - <url>$user.url</url> - <protected>$user.protected</protected> - <followers_count>$user.followers_count</followers_count> - <profile_background_color>$user.profile_background_color</profile_background_color> - <profile_text_color>$user.profile_text_color</profile_text_color> - <profile_link_color>$user.profile_link_color</profile_link_color> - <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color> - <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color> - <friends_count>$user.friends_count</friends_count> - <created_at>$user.created_at</created_at> - <favourites_count>$user.favourites_count</favourites_count> - <utc_offset>$user.utc_offset</utc_offset> - <time_zone>$user.time_zone</time_zone> - <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url> - <profile_background_tile>$user.profile_background_tile</profile_background_tile> - <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image> - <notifications>$user.notifications</notifications> - <geo_enabled>$user.geo_enabled</geo_enabled> - <verified>$user.verified</verified> - <following>$user.following</following> - <statuses_count>$user.statuses_count</statuses_count> - <lang>$user.lang</lang> - <contributors_enabled>$user.contributors_enabled</contributors_enabled> - <status>{{ if $user.status }} + <user> + <id>$user.id</id> + <name>$user.name</name> + <screen_name>$user.screen_name</screen_name> + <location>$user.location</location> + <description>$user.description</description> + <profile_image_url>$user.profile_image_url</profile_image_url> + <url>$user.url</url> + <protected>$user.protected</protected> + <followers_count>$user.followers_count</followers_count> + <friends_count>$user.friends_count</friends_count> + <created_at>$user.created_at</created_at> + <favourites_count>$user.favourites_count</favourites_count> + <utc_offset>$user.utc_offset</utc_offset> + <time_zone>$user.time_zone</time_zone> + <statuses_count>$user.statuses_count</statuses_count> + <following>$user.following</following> + <profile_background_color>$user.profile_background_color</profile_background_color> + <profile_text_color>$user.profile_text_color</profile_text_color> + <profile_link_color>$user.profile_link_color</profile_link_color> + <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color> + <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color> + <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url> + <profile_background_tile>$user.profile_background_tile</profile_background_tile> + <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image> + <notifications>$user.notifications</notifications> + <geo_enabled>$user.geo_enabled</geo_enabled> + <verified>$user.verified</verified> + <lang>$user.lang</lang> + <contributors_enabled>$user.contributors_enabled</contributors_enabled> + <status>{{ if $user.status }} <created_at>$user.status.created_at</created_at> <id>$user.status.id</id> <text>$user.status.text</text> @@ -43,4 +43,4 @@ <place>$user.status.place</place> <contributors>$user.status.contributors</contributors> {{ endif }}</status> -</user> + </user> diff --git a/view/de/strings.php b/view/de/strings.php index 6a43f049e..91c01f8cd 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -128,7 +128,7 @@ $a->strings["Post to Email"] = "An E-Mail senden"; $a->strings["Edit"] = "Bearbeiten"; $a->strings["Upload photo"] = "Foto hochladen"; $a->strings["Attach file"] = "Datei anhängen"; -$a->strings["Insert web link"] = "eine Kontaktanfrage"; +$a->strings["Insert web link"] = "einen Weblink einfügen"; $a->strings["Insert YouTube video"] = "YouTube-Video einfügen"; $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen"; $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen"; diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 17335389d..679d1d77e 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -2229,6 +2229,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 3dea20697..3471b67ad 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -2203,6 +2203,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index a9269f21d..bbd9a5330 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -1230,6 +1230,9 @@ aside #likes a:hover{ float: left; margin-right: 20px; } +#login-submit-wrapper{ + margin-top: 20px; + } .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; float: left; @@ -1245,7 +1248,7 @@ aside #likes a:hover{ .icon.text_add { background-image: url("../../../images/icons/16/add.png"); float: right; - opacity: 0.1; + opacity: 0.2; margin-right: 14px; } .icon.text_add:hover { @@ -1262,7 +1265,7 @@ transition: all 0.2s ease-in-out; } .icon.text_edit { background-image: url("../../../images/icons/10/edit.png"); - opacity: 0.1; + opacity: 0.2; margin-top: 6px; float: right; height: 10px; @@ -2487,6 +2490,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 2f25372a9..59d4fafe7 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -2190,6 +2190,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index f0b4fbd02..135cdb1c6 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -2170,6 +2170,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 923e63e3e..5459c65bd 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -1190,6 +1190,9 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +#login-submit-wrapper{ + margin-top: 20px; + } .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; float: left; @@ -1205,7 +1208,7 @@ aside #side-peoplefind-url { .icon.text_add { background-image: url("../../../images/icons/16/add.png"); float: right; - opacity: 0.1; + opacity: 0.2; margin-right: 14px; } .icon.text_add:hover { @@ -1222,7 +1225,7 @@ transition: all 0.2s ease-in-out; } .icon.text_edit { background-image: url("../../../images/icons/10/edit.png"); - opacity: 0.1; + opacity: 0.2; margin-top: 6px; float: right; height: 10px; @@ -2444,6 +2447,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 17b7af09b..03357f766 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -2226,6 +2226,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 74566d5c5..1b2caa6c0 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -2184,6 +2184,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index a722dbae9..6ca2370de 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1219,6 +1219,9 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +#login-submit-wrapper{ + margin-top: 20px; + } .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; float: left; @@ -1234,7 +1237,7 @@ aside #side-peoplefind-url { .icon.text_add { background-image: url("../../../images/icons/16/add.png"); float: right; - opacity: 0.1; + opacity: 0.2; margin-right: 14px; } .icon.text_add:hover { @@ -1251,7 +1254,7 @@ transition: all 0.2s ease-in-out; } .icon.text_edit { background-image: url("../../../images/icons/10/edit.png"); - opacity: 0.1; + opacity: 0.2; margin-top: 6px; float: right; height: 10px; @@ -2472,6 +2475,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/js/README b/view/theme/diabook/js/README index c93b2118e..57ca16d02 100644 --- a/view/theme/diabook/js/README +++ b/view/theme/diabook/js/README @@ -19,4 +19,8 @@ An integer representing the maximum width for the image. Example $(function() { $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); -});
\ No newline at end of file +}); + +_______________________________________________________________________________________________ + +http://javascriptly.com/examples/jquery-grab-bag/autogrow-textarea.html diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css index 8c4ad0c08..0289419f4 100644 --- a/view/theme/diabook/style-network-wide.css +++ b/view/theme/diabook/style-network-wide.css @@ -396,7 +396,7 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 15px; + font-size: 13px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; @@ -958,8 +958,8 @@ ul.menu-popup .empty { aside { display: table-cell; vertical-align: top; - width: 170px; - padding: 0px 10px 0px 0px; + width: 180px; + padding: 0px 5px 0px 0px; border-right: 1px solid #D2D2D2; float: left; /* background: #F1F1F1; */ @@ -1924,7 +1924,7 @@ transition: all 0.2s ease-in-out; ul.tabs { list-style-type: none; padding-bottom: 10px; - font-size: 15px; + font-size: 13px; width: 805px; } ul.tabs li { @@ -2169,6 +2169,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 1e57041e4..2e6a19481 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -2157,6 +2157,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css index 47fb80b6d..ffd790ea6 100644 --- a/view/theme/diabook/style-profile-wide.css +++ b/view/theme/diabook/style-profile-wide.css @@ -395,7 +395,7 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 15px; + font-size: 13px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; @@ -939,8 +939,8 @@ ul.menu-popup .empty { aside { display: table-cell; vertical-align: top; - width: 170px; - padding: 0px 10px 0px 0px; + width: 180px; + padding: 0px 5px 0px 0px; border-right: 1px solid #D2D2D2; float: left; /* background: #F1F1F1; */ @@ -1901,7 +1901,7 @@ transition: all 0.2s ease-in-out; ul.tabs { list-style-type: none; padding-bottom: 10px; - font-size: 15px; + font-size: 13px; width: 805px; } ul.tabs li { @@ -2151,6 +2151,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index ff39a0456..ebde6ecfc 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -2140,6 +2140,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css index d9a975e2c..64f82c487 100644 --- a/view/theme/diabook/style-wide.css +++ b/view/theme/diabook/style-wide.css @@ -423,7 +423,7 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 15px; + font-size: 13px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; @@ -1082,8 +1082,8 @@ ul.menu-popup .empty { aside { display: table-cell; vertical-align: top; - width: 170px; - padding: 0px 10px 0px 0px; + width: 180px; + padding: 0px 5px 0px 0px; border-right: 1px solid #D2D2D2; float: left; /* background: #F1F1F1; */ @@ -1185,6 +1185,9 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +#login-submit-wrapper{ + margin-top: 20px; + } /* widget */ .widget { margin-bottom: 2em; @@ -1261,7 +1264,7 @@ aside #side-peoplefind-url { .icon.text_add { background-image: url("../../../images/icons/16/add.png"); float: right; - opacity: 0.1; + opacity: 0.2; margin-right: 14px; } .icon.text_add:hover { @@ -1278,7 +1281,7 @@ transition: all 0.2s ease-in-out; } .icon.text_edit { background-image: url("../../../images/icons/10/edit.png"); - opacity: 0.1; + opacity: 0.2; margin-top: 6px; float: right; height: 10px; @@ -2124,7 +2127,7 @@ body .pageheader{ ul.tabs { list-style-type: none; padding-bottom: 10px; - font-size: 15px; + font-size: 13px; width: 805px; } ul.tabs li { @@ -2417,6 +2420,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index e73bd1f57..fa945f848 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1182,6 +1182,9 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +#login-submit-wrapper{ + margin-top: 20px; + } /* widget */ .widget { margin-bottom: 2em; @@ -1256,7 +1259,7 @@ aside #side-peoplefind-url { .icon.text_add { background-image: url("../../../images/icons/16/add.png"); float: right; - opacity: 0.1; + opacity: 0.2; margin-right: 14px; } .icon.text_add:hover { @@ -1273,7 +1276,7 @@ transition: all 0.2s ease-in-out; } .icon.text_edit { background-image: url("../../../images/icons/10/edit.png"); - opacity: 0.1; + opacity: 0.2; margin-top: 6px; float: right; height: 10px; @@ -2406,6 +2409,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/duepuntozero/lang_selector.tpl b/view/theme/duepuntozero/lang_selector.tpl new file mode 100644 index 000000000..e777a0a86 --- /dev/null +++ b/view/theme/duepuntozero/lang_selector.tpl @@ -0,0 +1,10 @@ +<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div> +<div id="language-selector" style="display: none;" > + <form action="#" method="post" > + <select name="system_language" onchange="this.form.submit();" > + {{ for $langs.0 as $v=>$l }} + <option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option> + {{ endfor }} + </select> + </form> +</div> |