Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/calendar/templates/settings.php3
-rw-r--r--apps/contacts/appinfo/app.php3
-rw-r--r--apps/contacts/settings.php6
-rw-r--r--apps/contacts/templates/settings.php7
-rw-r--r--apps/media/appinfo/app.php1
-rw-r--r--apps/media/settings.php6
-rw-r--r--apps/media/templates/settings.php7
-rw-r--r--core/css/styles.css4
-rw-r--r--core/templates/layout.guest.php2
9 files changed, 36 insertions, 3 deletions
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index ac13b2aa402..60b524a535a 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -25,5 +25,8 @@
endif;
endforeach;?>
</select><span class="msg"></span>
+ <br />
+ Calendar CalDAV Syncing URL:
+ <?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?><br />
</fieldset>
</form>
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 98416ead2fc..fc7b3769c53 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -17,3 +17,6 @@ OC_App::addNavigationEntry( array(
'href' => OC_Helper::linkTo( 'contacts', 'index.php' ),
'icon' => OC_Helper::imagePath( 'settings', 'users.svg' ),
'name' => 'Contacts' ));
+
+
+OC_APP::registerPersonal('contacts','settings');
diff --git a/apps/contacts/settings.php b/apps/contacts/settings.php
new file mode 100644
index 00000000000..b88128823a7
--- /dev/null
+++ b/apps/contacts/settings.php
@@ -0,0 +1,6 @@
+<?php
+
+$tmpl = new OC_Template( 'contacts', 'settings');
+
+return $tmpl->fetchPage();
+?>
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
new file mode 100644
index 00000000000..29e6f159b2a
--- /dev/null
+++ b/apps/contacts/templates/settings.php
@@ -0,0 +1,7 @@
+<form id="mediaform">
+ <fieldset class="personalblock">
+ <strong>Contacts</strong><br />
+ CardDAV Syncing URL:
+ <?php echo OC_Helper::linkTo('apps/contacts', 'carddav.php', null, true); ?><br />
+ </fieldset>
+</form>
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index 0d36217bd4d..dd1a830a94b 100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -25,6 +25,7 @@ $l=new OC_L10N('media');
require_once('apps/media/lib_media.php');
OC_Util::addScript('media','loader');
+OC_APP::registerPersonal('media','settings');
OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
diff --git a/apps/media/settings.php b/apps/media/settings.php
new file mode 100644
index 00000000000..133440a9af6
--- /dev/null
+++ b/apps/media/settings.php
@@ -0,0 +1,6 @@
+<?php
+
+$tmpl = new OC_Template( 'media', 'settings');
+
+return $tmpl->fetchPage();
+?>
diff --git a/apps/media/templates/settings.php b/apps/media/templates/settings.php
new file mode 100644
index 00000000000..70ee6dbc1ea
--- /dev/null
+++ b/apps/media/templates/settings.php
@@ -0,0 +1,7 @@
+<form id="mediaform">
+ <fieldset class="personalblock">
+ <strong>Media</strong><br />
+ Ampache URL:
+ <?php echo OC_Helper::linkTo('apps/media', 'tomahawk.php', null, true); ?><br />
+ </fieldset>
+</form>
diff --git a/core/css/styles.css b/core/css/styles.css
index 343ee4ca42d..41781ec191b 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -61,8 +61,8 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
/* LOG IN & INSTALLATION ------------------------------------------------------------ */
#body-login { background:#ddd; }
-#body-login p.info { width:16em; margin:2em auto; padding:1em; background:#eee; -moz-box-shadow:0 1px 0 #bbb inset; -webkit-box-shadow:0 1px 0 #bbb inset; box-shadow:0 1px 0 #bbb inset; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; }
-#body-login p.info a { font-weight:bold; }
+#body-login p.info { width:21em; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; }
+#body-login p.info a { font-weight:bold; color:#777; }
#login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; }
#login form { width:18em; margin:2em auto 5em; padding:0; }
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 7e05fce0ecf..96f3d2662fb 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -32,6 +32,6 @@
</div></header>
<?php echo $_['content']; ?>
</div>
- <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'gives you freedom and control over your own data' ); ?></p></footer>
+ <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a>: <?php echo $l->t( 'web services under your control' ); ?></p></footer>
</body>
</html>