# HG changeset patch
# User Todd Larsen <tlarsen@google.com>
# Date 1217887775 0
# Node ID 1627b79c396ad33695533279fe58011ab9ae3239
# Parent  b0d38b0f8276c833860adda5ecf7a06227cc115f
Finish moving the remaining "prototype" app pieces out of apps/proto,
and then remove trunk/apps.  There is still some editing to do in the
newly-relocated files (now in trunk/app/soc and trunk/app/ghop).

diff -r b0d38b0f8276 -r 1627b79c396a app/ghop/templates/ghop/person/profile.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/ghop/templates/ghop/person/profile.html	Mon Aug 04 22:09:35 2008 +0000
@@ -0,0 +1,20 @@
+{% extends 'soc/person/profile.html' %}
+{% comment %}
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+{% endcomment %}
+{% block 'stylesheet' %}
+<link rel="stylesheet" type="text/css" href="/content/proto.css" />
+{% endblock %}
+{% block 'logo' %}
+<img src="/content/logo.jpg" alt="Melange" />
+{% endblock %}
diff -r b0d38b0f8276 -r 1627b79c396a app/soc/content/css/soc.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/content/css/soc.css	Mon Aug 04 22:09:35 2008 +0000
@@ -0,0 +1,36 @@
+/*
+Copyright 2008 the Melange authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ */
+
+body {
+  font-family: Verdana, Helvetica, sans-serif;
+  background-color: #DDDDDD;
+}
+
+td.formfieldrequired {
+ font-style: italic;
+}
+
+td.formfieldhelptext {
+ font-style: italic;
+}
+
+td.formfielderror {
+ color: #FF0000;
+}
+
+td.formfieldheading {
+ font-weight: bold;
+}
diff -r b0d38b0f8276 -r 1627b79c396a app/soc/content/images/dune.jpg
Binary file app/soc/content/images/dune.jpg has changed
diff -r b0d38b0f8276 -r 1627b79c396a apps/proto/content/logo.jpg
Binary file apps/proto/content/logo.jpg has changed
diff -r b0d38b0f8276 -r 1627b79c396a apps/proto/content/proto.css
--- a/apps/proto/content/proto.css	Mon Jul 28 21:27:52 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-Copyright 2008 the Melange authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
- */
-
-body {
-  font-family: Verdana, Helvetica, sans-serif;
-  background-color: #DDDDDD;
-}
-
-td.formfieldrequired {
- font-style: italic;
-}
-
-td.formfieldhelptext {
- font-style: italic;
-}
-
-td.formfielderror {
- color: #FF0000;
-}
-
-td.formfieldheading {
- font-weight: bold;
-}
diff -r b0d38b0f8276 -r 1627b79c396a apps/proto/proto/templates/proto/person/profile.html
--- a/apps/proto/proto/templates/proto/person/profile.html	Mon Jul 28 21:27:52 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-{% extends 'soc/person/profile.html' %}
-{% comment %}
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-{% endcomment %}
-{% block 'stylesheet' %}
-<link rel="stylesheet" type="text/css" href="/content/proto.css" />
-{% endblock %}
-{% block 'logo' %}
-<img src="/content/logo.jpg" alt="Melange" />
-{% endblock %}