Directory structure change and various edits

18 files changed, 162 insertions, 16 deletions

diff --git a/CFD/casestudy-dev-doc.rst b/CFD/casestudy-dev-doc.rst
index d510d2b..feefc9f 100644
--- a/CFD/casestudy-dev-doc.rst
+++ b/CFD/casestudy-dev-doc.rst
@@ -62,10 +62,12 @@ Field Conditional State
 
 SMTP Authentication Support
 
-**Structure-> Field collection-> Field collection
-field\_personal\_details**
 
-|image0|
+**Structure-> Field collection-> Field collection field\_personal\_details**
+**Create-> Content Types -> Case Study Proposal**
+
+|image111|
+
 
 **Create-> Content Types -> Case Study Proposal**
 
@@ -93,7 +95,10 @@ accepted.
 
 |image2|
 
-**Views**
+
+**View**
+
+**Structure -> Views ->Case Study**
 
 1. **Manage Proposal.**
 
@@ -114,16 +119,157 @@ accepted.
 
 |image3|
 
-.. |image0| image:: media/image8.png
-   :width: 6.26772in
-   :height: 2.51389in
-.. |image1| image:: media/image5.png
+2. **In Progress**
+
+    **Purpose-** This page displays the case studies in progress. The
+    Proposals that are approved but not competed.
+
+    **URL-**
+    `*http://cfd.fossee.in/case-study/cs-in-progress* <http://cfd.fossee.in/case-study/cs-in-progress>`__
+
+    **Roles-** All
+
+    Description
+
+-  The display is in the table format
+
+-  The view is filtered by the criteria -
+
+   -  Case study proposal
+
+   -  Content is published
+
+   -  Proposal Status
+
+|image4|
+
+3. **Code Submission**
+
+    **Purpose-** This is the interface where the user can submit the
+    codes once the proposal is accepted
+
+    **URL-**
+    `*http://cfd.fossee.in/case-study/cs-code-submission* <http://cfd.fossee.in/case-study/cs-code-submission>`__
+
+    **Roles-** All
+
+    Description
+
+-  The display is in the table format
+
+-  The view is filtered by the criteria -
+
+   -  Case study proposal
+
+   -  Content is published
+
+   -  Proposal Status
+
+|image5|
+
+4. **Manage code**
+
+    **Purpose-** This is the admin interface for the reviewer to
+    accept/reject the case study codes are submitted.
+
+    **URL-**
+    `*http://cfd.fossee.in/case-study/cs-manage-code* <http://cfd.fossee.in/case-study/cs-manage-code>`__
+
+    **Roles-** Administrator, Case Study Reviewer
+
+    Description
+
+-  The display is in the table format
+
+-  The view is filtered by the criteria -
+
+   -  Case study proposal
+
+   -  Content is published
+
+   -  Proposal Status
+
+|image6|
+
+5. **Completed Case Studies**
+
+    **Purpose-** This is the admin interface for the reviewer to
+    accept/reject the case study codes are submitted.
+
+    **URL-**
+    `*http://cfd.fossee.in/case-study/cs-code-submission* <http://cfd.fossee.in/case-study/cs-code-submission>`__
+
+    **Roles-** Administrator, Case Study Reviewer
+
+    Description
+
+-  The display is in the table format
+
+-  The view is filtered by the criteria -
+
+   -  Case study proposal
+
+   -  Content is published
+
+   -  Proposal Status
+
+|image7|
+
+6. **Attachment- After code submission**
+
+    **Purpose-** This is the admin interface for the reviewer to
+    accept/reject the case study codes are submitted.
+
+    **URL-**
+    `*http://cfd.fossee.in/case-study/cs-code-submission* <http://cfd.fossee.in/case-study/cs-code-submission>`__
+
+    **Roles-** Administrator, Case Study Reviewer
+
+    Description
+
+-  The display is in the table format
+
+-  The view is filtered by the criteria -
+
+   -  Case study proposal
+
+   -  Content is published
+
+   -  Proposal Status
+
+|image8|
+
+**Configuration -> Workflow -> Rules**
+
+The Rules module allows site administrators to define conditionally
+executed actions based on occurring events
+
+On approval CS
+
+.. |image111| image:: media/personaldetailsFC.png
+   :width: 6.65104in
+   :height: 2.37500in
+.. |image1| image:: media/CT-proposal.png
    :width: 6.71875in
    :height: 5.14063in
-.. |image2| image:: media/image3.png
+.. |image2| image:: media/CT-submission.png
    :width: 6.27083in
    :height: 2.38021in
-.. |image3| image:: media/image7.png
-   :width: 6.84375in
-   :height: 4.31771in
-
+.. |image3| image:: media/manage-proposal.png
+   :width: 6.91146in
+   :height: 3.77083in
+.. |image4| image:: media/in-progress.png
+   :width: 6.96354in
+   :height: 3.97917in
+.. |image5| image:: media/code-submission.png
+   :width: 6.95313in
+   :height: 4.10417in
+.. |image6| image:: media/manage-code.png
+   :width: 6.80729in
+   :height: 3.98958in
+.. |image7| image:: media/competed-cs.png
+   :width: 6.86979in
+   :height: 4.19792in
+.. |image8| image:: media/after-code-sub.png
+   :width: 6.26772in
+   :height: 2.90278in
diff --git a/CFD/media/CT-proposal.png b/CFD/media/CT-proposal.png
new file mode 100644
index 0000000..75002eb
--- /dev/null
+++ b/CFD/media/CT-proposal.png
diff --git a/CFD/media/CT-submission.png b/CFD/media/CT-submission.png
new file mode 100644
index 0000000..9f0a7e4
--- /dev/null
+++ b/CFD/media/CT-submission.png
diff --git a/CFD/media/after-code-sub.png b/CFD/media/after-code-sub.png
new file mode 100644
index 0000000..65c7b77
--- /dev/null
+++ b/CFD/media/after-code-sub.png
diff --git a/CFD/media/code-submission.png b/CFD/media/code-submission.png
new file mode 100644
index 0000000..740420e
--- /dev/null
+++ b/CFD/media/code-submission.png
diff --git a/CFD/media/competed-cs.png b/CFD/media/competed-cs.png
new file mode 100644
index 0000000..cccecb4
--- /dev/null
+++ b/CFD/media/competed-cs.png
diff --git a/CFD/media/in-progress.png b/CFD/media/in-progress.png
new file mode 100644
index 0000000..cf85a2e
--- /dev/null
+++ b/CFD/media/in-progress.png
diff --git a/CFD/media/manage-code.png b/CFD/media/manage-code.png
new file mode 100644
index 0000000..747b83d
--- /dev/null
+++ b/CFD/media/manage-code.png
diff --git a/CFD/media/manage-proposal.png b/CFD/media/manage-proposal.png
new file mode 100644
index 0000000..1b2563c
--- /dev/null
+++ b/CFD/media/manage-proposal.png
diff --git a/CFD/media/personaldetailsFC.png b/CFD/media/personaldetailsFC.png
new file mode 100644
index 0000000..897a3bc
--- /dev/null
+++ b/CFD/media/personaldetailsFC.png
diff --git a/Critical-analysis-FOSSEE-websites.rst b/General/Critical-analysis-FOSSEE-websites.rst
index dc8e2a6..dc8e2a6 100644
--- a/Critical-analysis-FOSSEE-websites.rst
+++ b/General/Critical-analysis-FOSSEE-websites.rst
diff --git a/Drupal6-Drupal7-upgrade-process.rst b/General/Drupal6-Drupal7-upgrade-process.rst
index 51da149..1dd4e88 100644
--- a/Drupal6-Drupal7-upgrade-process.rst
+++ b/General/Drupal6-Drupal7-upgrade-process.rst
@@ -1,4 +1,4 @@
-**Process to upgrade from drupal 6 to drupal 7**
+***Process to upgrade from drupal 6 to drupal 7***
 
 
 Document Information
diff --git a/Drupal7-site-setup.rst b/General/Drupal7-site-setup.rst
index d2b789b..956ba82 100644
--- a/Drupal7-site-setup.rst
+++ b/General/Drupal7-site-setup.rst
@@ -1,4 +1,3 @@
-**Drupal 7 Site Setup**
 
 Document Information
 ====================
@@ -9,7 +8,8 @@ Date: 5/04/2015
 
 Author: Priyanka Bhagwat and Prashant Sinalakar
 
-**Prerequirement**
+Prerequisite
+====================
 
 **Linux, Apache, MySql, PHP**
 
diff --git a/Instruction-Sheet-develop-deploy-website.rst b/General/Instruction-Sheet-develop-deploy-website.rst
index 844f76c..844f76c 100644
--- a/Instruction-Sheet-develop-deploy-website.rst
+++ b/General/Instruction-Sheet-develop-deploy-website.rst
diff --git a/Scilab/media/TBCAdmin.jpg b/Scilab/media/TBCAdmin.jpg
new file mode 100644
index 0000000..e8dce05
--- /dev/null
+++ b/Scilab/media/TBCAdmin.jpg
diff --git a/Scilab/media/TBCAdmin.png b/Scilab/media/TBCAdmin.png
deleted file mode 100644
index 774fbee..0000000
--- a/Scilab/media/TBCAdmin.png
+++ /dev/null
diff --git a/Scilab/media/TBCER.jpg b/Scilab/media/TBCER.jpg
new file mode 100644
index 0000000..0621a21
--- /dev/null
+++ b/Scilab/media/TBCER.jpg
diff --git a/Scilab/media/TBCER.png b/Scilab/media/TBCER.png
deleted file mode 100644
index 36d2050..0000000
--- a/Scilab/media/TBCER.png
+++ /dev/null