rename daas to dcid

.gitattributes

@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.gitignore

@@ -0,0 +1,165 @@
+#settings.py #customized for you machine
+
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+*.dotCover
+
+## TODO: If you have NuGet Package Restore enabled, uncomment this
+#packages/
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+*.Cache
+ClientBin
+stylecop.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Mac crap
+.DS_Store

LICENSE.txt

@@ -1,7 +1,7 @@
   Description here...
 
   Copyright (C) 2012
-  Diogo Nunes, ...
+  Diogo Nunes, Cátia Ferreira, Paulo Martins, Rafael Santos, ...
 
   This program is free software: you can redistribute it and/or modify it under
   the terms of the GNU General Public License version 3 as published by the

README.md

@@ -1,3 +1,3 @@
-#dcid
+#dcid
 
-**Decisão do Cidadão, é você que dcid!**
+**Decisão do Cidadão, é você que dcid!**

apache/apache_django_wsgi.conf

@@ -1,11 +1,11 @@
-Alias /images/ "c:/wamp/www/daas/templates/images/"
-<Directory "c:/wamp/www/daas/images>
+Alias /images/ "c:/wamp/www/dcid/templates/images/"
+<Directory "c:/wamp/www/dcid/images>
     Order allow,deny
     Allow from all
 </Directory>
 
-#WSGIScriptAlias / "c:/wamp/www/daas/apache/django.wsgi"
+WSGIScriptAlias / "c:/wamp/www/dcid/apache/django.wsgi"
 
-<Directory "c:/wamp/www/daas/apache">
+<Directory "c:/wamp/www/dcid/apache">
     Allow from all
 </Directory>

apache/django.wsgi

@@ -1,7 +1,7 @@
 import os, sys
 
-sys.path.append('c:/wamp/www/daas')
-os.environ['DJANGO_SETTINGS_MODULE'] = 'daas.settings'
+sys.path.append('c:/wamp/www/dcid')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'dcid.settings'
 
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()

dcid/settings.py

@@ -1,4 +1,4 @@
-# Django settings for daas project.
+# Django settings for dcid project.
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -11,11 +11,11 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.mysql',	# Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'dcid_db', 					  	# Or path to database file if using sqlite3.
-        'USER': 'admin',						# Not used with sqlite3.
-        'PASSWORD': 'admin',			# Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': 'dcid_db',                      # Or path to database file if using sqlite3.
+        'USER': 'admin',                      # Not used with sqlite3.
+        'PASSWORD': 'admin',                  # Not used with sqlite3.
+        'HOST': 'localhost',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
     }
 }
@@ -78,7 +78,7 @@
 )
 
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = '!e)5^#c572+s#@b1r8r$3&g$_=#^jl)%%ht!%_rr1qc1vjnb&b'
+SECRET_KEY = '_5s047mnm!*flrgn)es8@kzigeqnarc2s@_q9wxkwve5c60f!5'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
@@ -103,8 +103,10 @@
 WSGI_APPLICATION = 'dcid.wsgi.application'
 
 TEMPLATE_DIRS = (
-        "/home/paulo/code4pt/dcid/templates/",
-    # Strings here, like "/home/html/django_templates" or "C:/www/django/templates". ALWAYS use forward slashes.
+	"C:/wamp/www/dcid/templates/",
+    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
 )
 
 INSTALLED_APPS = (

dcid/urls.py

@@ -8,7 +8,7 @@
     url(r'^admin/', include(admin.site.urls)),
 
     # Examples:
-    # url(r'^$', 'daas.views.home', name='home'),
+    # url(r'^$', 'dcid.views.home', name='home'),
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
 )

dcid/wsgi.py

@@ -1,5 +1,5 @@
 """
-WSGI config for daas project.
+WSGI config for dcid project.
 
 This module contains the WSGI application used by Django's development server
 and any production WSGI deployments. It should expose a module-level variable
@@ -15,7 +15,7 @@
 """
 import os
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "daas.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dcid.settings")
 
 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION

manage.py

@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "daas.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dcid.settings")
 
     from django.core.management import execute_from_command_line
 

parliament/models.py

@@ -53,9 +53,6 @@ def votedown(self):
 
 	def __unicode__(self):
 		return self.title
-
-
-
 
 class Tag(models.Model):
 	"""A Tag is a subject or theme that classifies a specimen (like a

parliament/static/php/common_daas.php

@@ -1,6 +1,6 @@
 <?php
 
-$navbar_top_daas = '
+$navbar_top_dcid = '
     <div class="navbar navbar-inverse navbar-fixed-top">
         <div class="navbar-inner">
             <div class="container">
@@ -11,9 +11,9 @@
                 <a class="brand" href="/">Code4PT</a>
                 <div class="nav-collapse collapse" style="height: 0px; ">
                     <ul class="nav">
-                        <li class="active"><a href="/daas/">DaaS</a></li>
-                        <li><a href="/daas/team.php">Team</a></li>
-                        <li><a href="/daas/contact.php">Contact</a></li>
+                        <li class="active"><a href="/dcid/">dcid</a></li>
+                        <li><a href="/dcid/team.php">Team</a></li>
+                        <li><a href="/dcid/contact.php">Contact</a></li>
                     </ul>
                 </div>
             </div>

parliament/static/php/common_home.php

@@ -14,7 +14,7 @@
                         <li class="active"><a href="/">Home</a></li>
                         <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Projects<b class="caret"></b></a>
                             <ul class="dropdown-menu">
-                                <li><a href="/daas/">DaaS</a></li>
+                                <li><a href="/dcid/">dcid</a></li>
                             </ul>
                         </li>
                     </ul>

templates/admin/base_site.html

@@ -1,10 +1,10 @@
 {% extends "admin/base.html" %}
 {% load i18n %}
 
-{% block title %}{{ title }} | {% trans 'DaaS Django' %}{% endblock %}
+{% block title %}{{ title }} | {% trans 'dcid Django' %}{% endblock %}
 
 {% block branding %}
-<h1 id="site-name">{% trans 'DaaS - Django administration' %}</h1>
+<h1 id="site-name">{% trans 'dcid - Django administration' %}</h1>
 {% endblock %}
 
 {% block nav-global %}{% endblock %}

templates/parliament/base.html

@@ -18,7 +18,7 @@
         <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 
-        <title>{% block title %}DaaS{% endblock %}</title>
+        <title>{% block title %}dcid{% endblock %}</title>
         <meta name="description" content="{% block description %}Default description{% endblock %}">
     </head>
     <body>
@@ -29,7 +29,7 @@
                 <div class="container">
                     <a class="btn btn-navbar collapsed" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span> </a>
                     {% block navbar-content %}
-                    <a class="brand" href="/parliament/">DaaS Django</a>
+                    <a class="brand" href="/parliament/">dcid</a>
                     <div class="nav-collapse collapse" style="height: 0px; ">
                         <ul class="nav">
                             <li class="active"><a href="/parliament/">Home</a></li>